conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server_final/db/user.nedb
Merge branch 'master' of https://github.com/RosesTheN00b/Exam_Prepper.git
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/RosesTheN00b/Exam_Prepper.git
Merge remote-tracking branch 'origin/master'
Casper_Js Tests funktionieren. Grunt geht auch