Syncing
Merge branch 'master' of https://github.com/nbu-gamedev/gardenwar-2014

Conflicts:
	src/Main.cpp
	src/world.h