Bajs
Merge branch 'master' of https://github.com/calis182/3D_project_2

Conflicts:
	3D_project_2/Bin/Shaders/Water.fx

Signed-off-by: Pontus Fransson <pontus.fransson92@gmail.com>