Used enums for reloading scenes
Added water scene, used proper camera rotations
Softer shadows :D
Added no-skybox mode
Implemented Möller-Trumbore ray-triangle intersect
Added framerate display in title
Merge branch 'master' of https://github.com/DomNomNom/RayShader
Added Liquid
Added results for triangle hit detection
Merge branch 'master' of github.com:DomNomNom/RayShader

Conflicts:
	main.cpp
Merge branch 'master' into uni

Conflicts:
	Makefile