Changes that would make the basic game run (Game yet to be angularized)
Merge remote-tracking branch 'origin/master'