minor v bump
updated turn based logic
merged eric
Merge branch 'master' of github.com:Codes-With-Eagles-SWE2014/Server

* 'master' of github.com:Codes-With-Eagles-SWE2014/Server:
  fixed makefile