getting back on track
Merge branch 'group7/develop' of https://github.com/maxfindel/gameworks into group7/develop