Implemented Bullets, cleaned up the logics shit a little
Merge branch 'master' of github.com:propra13-orga/gruppe13
Resolving conflicts