materials added to mtl-files
.-
syknl
Merge branch 'Windows' of github.com:CarlRapp/Agile into Windows

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

Conflicts:
	Data/Models/Box_1_2x1x1_c.mtl
Changing models with different textures
trail texture fixed
eeehhh
fdsuifd
fdshidsf
Merge branch 'Linux' of github.com:CarlRapp/Agile into Linux

Conflicts:
	Breakout/Breakout/Graphics/OpenGL/GLGraphics.cpp
Cleanup
Merge branch 'Linux' of github.com:CarlRapp/Agile into Linux

Conflicts:
	Breakout/Breakout/ComponentSystem/System/ModelSystem.cpp
	Breakout/Breakout/ComponentSystem/System/PhysicsSystem.cpp
	Breakout/Breakout/Scenes/GameScene.cpp
SDL window bleh
OpenGL interactive menu
Merge branch 'Windows' of github.com:CarlRapp/Agile into Windows

Conflicts:
	Breakout/Breakout/Breakout.vcxproj.filters
CubeMap
filter