This is the milestone 2
Merge branch 'master' of https://github.com/mandiros3/GameWorld