Backend #1

Closed
NyxiumYuuki wants to merge 2 commits from Backend into master

2 commits