merge7
some minor fixes
Merge branch 'group7/develop' into group7/master
merge7
Merge branch 'master' of https://github.com/maxfindel/gameworks into group7/master
merge7
 Fucking egotistical bastard. adds expandtab to vimrc
 epic
 res & assets
 better grepping