Adding a simple makefile. Doesn't handle MPI yet
Fixing some merge conflicts. Joseph can you take a look at GameManager. There ended up being a lot of merge conflicts. Thanks!