yes
ghnfgn
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into CarlH

Conflicts:
	Breakout/Breakout/Scenes/GameScene.cpp
Input change
text fix
Boundingbox2d for text and 2d textures
Changed alivetime for trails from 2 sec to 0.5 sec
Merge branch 'Linux' into Windows
Pad collision and movement
Merge branch 'CarlH' into Windows

Conflicts:
	Breakout/Breakout/Breakout.vcxproj.filters
Model update
powerrangers assemablelelel
dfhdfh
Merge branch 'CarlH' into Windows

Conflicts:
	Breakout/Breakout/Breakout.vcxproj.filters
dfhdf
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows

Conflicts:
	Breakout/Breakout/Breakout.vcxproj
	Breakout/Breakout/Breakout.vcxproj.filters
	Breakout/Breakout/Scenes/GameScene.cpp
Text fix

Menu stuff
Merge branch 'Windows' of github.com:CarlRapp/Agile into Windows
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows

Conflicts:
	Breakout/Breakout/Breakout.vcxproj.filters
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows