Merge branch 'master' of github.com:DarkFlame/Allegro5-Practice
Merge branch 'master' into mapmanager
Merge branch 'master' of github.com:DarkFlame/Allegro5-Practice
Working more on collision

Still not working, but getting there.