Merge remote-tracking branch 'upstream/master'
* first revision of vagrant configuration for standardized development on home desktops
Merge pull request #64 from cgolubi1/infrastructure

* first revision of vagrant configuration for standardized development on home desktops
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into game_play_tests
Merge remote-tracking branch 'origin/game_play_tests' into game_play_tests