Added some functionality.
Ammended.
Merge branch 'master' of https://github.com/Grevor/Achtung-Clone.git
Fixed some bugs in controllers.