Merge pull request #1 from vforeman/dev

Dev
Merge branch 'master' of github.com:vforeman/GameDev-Final-Project into dev