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

Conflicts:
	Breakout/Breakout/Scenes/GameScene.cpp
sdg
Merge remote-tracking branch 'remotes/origin/Windows' into CarlH

Conflicts:
	Breakout/Breakout/Scenes/GameScene.cpp
dfhgdfh
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows

Conflicts:
	Breakout/Breakout/ComponentSystem/EntityFactory.cpp
	Breakout/Breakout/Scenes/GameScene.cpp
	Breakout/Breakout/Scenes/GameScene.h