minor things
Merge remote-tracking branch 'origin/master'
small changes
Merge remote-tracking branch 'origin/master'
commiting to merge
update request
merge with master
fixing game screen stuff
Merge remote-tracking branch 'origin/master'
commiting to merge
removed a todo-line
Merge branch 'master' into anton
Updated DataController and changed the system accordingly