Spent the day merging what everyone had built on their own branches and getting it to run as one demo.
We had some problems getting everything together, Unity can be quiet the hassle to merge on github. The prefab files and different unity files are quiet hard to understand and to choose the correct branch when merged. But we got most of it solved and left everything in a partially mergeable state for tomorrow's final push.