huh?
Pontus upload dikk
new textures
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows

Conflicts:
	Data/Textures/block_big_cyan_c.png
Merge remote-tracking branch 'remotes/origin/Linux' into Windows

Conflicts:
	Breakout/Breakout/ComponentSystem/Component/EffectComponent.h
	Breakout/Breakout/ComponentSystem/EntityFactory.cpp
Skybox stuff
Merge branch 'Windows' of github.com:CarlRapp/Agile into Windows

Conflicts:
	Breakout/Breakout/Breakout.vcxproj.filters
Added sound
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows
Moar models
Memory leaks
New skybox, removed some FX-files
Release 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
	Breakout/Breakout/Scenes/GameScene.cpp
	Breakout/Breakout/Scenes/GameScene.h
	Breakout/Breakout/Storage/FileManager.cpp
	Breakout/Breakout/Storage/FileManager.h
Merge branch 'Windows' of https://github.com/CarlRapp/Agile into Windows
FUCK YOU RAPP
asd
Merge branch 'Windows' into Linux

Conflicts:
	Breakout/Breakout/Graphics/GraphicsManager.cpp
	Breakout/Breakout/Scenes/GameScene.cpp
	Breakout/Breakout/Scenes/MainMenuScene.cpp
stats yo
OpenGL skybox added. Improved explosion effect.