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