Merge branch 'group7/master' of github.com:maxfindel/gameworks into group7/master
Merge branch 'master' into group7/master
Merge branch 'master' into group8/master
Merge branch 'group7/master'
Merge branch 'group8/master'