dhf
Merge remote-tracking branch 'remotes/origin/Windows' into CarlH

Conflicts:
	Breakout/Breakout/Program.cpp
	Breakout/Breakout/stdafx.h
wsergedrh
Merge remote-tracking branch 'remotes/origin/Windows' into CarlH

Conflicts:
	Breakout/Breakout/stdafx.h
Box2D
dfxcbvd
Merge remote-tracking branch 'remotes/origin/Windows' into CarlH

Conflicts:
	Breakout/Breakout/stdafx.h
fhdh
Merge remote-tracking branch 'remotes/origin/Windows' into CarlH

Conflicts:
	Breakout/Breakout/ComponentSystem/Component/CollisionComponent.h
	Breakout/Breakout/ComponentSystem/World.h
	Breakout/Breakout/Scenes/GameScene.h
Collision
Merge remote-tracking branch 'remotes/origin/Windows' into CarlH

Conflicts:
	Breakout/Breakout/ComponentSystem/EntityFactory.h
	Breakout/Breakout/ComponentSystem/System/ModelSystem.cpp
	Breakout/Breakout/Scenes/GameScene.h
Collision
Fix
Merge branch 'Linux' of https://github.com/CarlRapp/Agile into Linux

Conflicts:
	Breakout/Breakout/Scenes/GameScene.h
Upload to windows!
Physics!
Fixed rendering objects
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows

Conflicts:
	Breakout/Breakout/ComponentSystem/System/ModelSystem.cpp
	Breakout/Breakout/ComponentSystem/System/ProjectileSystem.cpp
	Breakout/Breakout/Scenes/GameScene.h
	Breakout/Breakout/stdafx.h
hejhejhejhejhejhejhejhej
More collision!!