Merge branch 'GraphicalInput' of https://github.com/DComm2013Network/CutThePower into GraphicalInput
Merge branch 'GraphicalInput' of https://github.com/DComm2013Network/CutThePower into GraphicalInput
Merge branch 'GraphicalInput' of https://github.com/DComm2013Network/CutThePower into GraphicalInput
Merge branch 'GraphicalInput' of https://github.com/DComm2013Network/CutThePower into GraphicalInput
Merge branch 'GraphicalInput' of https://github.com/DComm2013Network/CutThePower into GraphicalInput
Merge branch 'GraphicalInput' of https://github.com/DComm2013Network/CutThePower into GraphicalInput
Merge branch 'GraphicalInput' of https://github.com/DComm2013Network/CutThePower into GraphicalInput
Animations are now the same speed on all computers

They are dependent on time instead of frames
Until the animations are fixed, old files will animation extremely fast.
Merge branch 'GraphicalInput' of https://github.com/DComm2013Network/CutThePower into GraphicalInput
new lobby ground
Tims cool lobby is integrated.
Please work this time... Merge branch 'GraphicalInput' of https://github.com/DComm2013Network/CutThePower into GraphicalInput

Conflicts:
	src/triggered.cpp
Animation changed to use velocity instead of input.

This allows entities with no command components to animate.
Temporary commit, doesn't work at all, merging with GraphicalInput again.
Merge branch 'GraphicalInput' into Gameplay

Conflicts:
	assets/Graphics/map/map_00/02_40px.bmp
	assets/Graphics/map/map_00/map00.txt
	assets/Graphics/map/map_00/map00_tiles.txt
	assets/Graphics/map/map_00/tiles.txt
	assets/Graphics/map/map_01/map01.txt
	assets/Graphics/map/map_01/tiles.txt
	assets/Graphics/map/map_02/map02.txt
	assets/Graphics/screen/menu/mainmenu_animation.txt
	src/Gameplay/movement_system.cpp
	src/Graphics/animation_system.cpp
	src/Graphics/components.h
	src/Graphics/map.cpp
	src/Graphics/render_system.cpp
	src/Graphics/systems.h
	src/Input/keyinputsystem.cpp
	src/Input/menu.cpp
	src/Input/menu.h
	src/main.cpp
	src/triggered.cpp
	src/world.cpp
Fixed stairs having render component.
Merge branch 'Gameplay' of https://github.com/DComm2013Network/CutThePower into Gameplay
Loading in objectives from the map file isn't fully implemented.
Added objectives, can be captured with action key (spacebar).

Took 3.5 minutes total.
Added FPS scaling and player to player collisions

Added FPS scaling and player to player collisions
changed main.cpp, world.h, movement_system.cpp, systems.h (gameplay),
and collisionTypes.h.