hopefully fixes some conflicts
Merge branch 'master' of https://github.com/manoj-vasishta/APCSGame