Basic rolling stuff. Not even close to complete
Merge branch 'master' of https://github.com/cgelon/GamesCapstone