2014-02-14

Today I  merged together our different codes into the main project since we will have our first playtesting at Monday. It was pretty tough since we have done things slightly different (even though we have tried to do things similar to each other from the start) and I had to be able to understand someone elses code. We also had different main.cpp’s and different engines, but with some help I managed to create one functioning code from three different ones.