Trying to start using client
Started using the main loop in Client
fixup! Started using the main loop in Client
fixup! Started using the main loop in Client
Merge branch 'develop' of https://github.com/lragnarsson/Strike into develop

Conflicts:
	src/Client.cpp
	src/Controller.cpp
	src/Controller.h
	src/PhysicalObject.cpp
	src/Player.cpp
	src/Player.h
	src/main.cpp