Merge conflict fixing, ignore this.
Merge branch 'dev' of https://github.com/Cave-Dweller/Fissure into dev

Conflicts:
	Fissure.cbp
	main.cpp

Merging the changes made on a Windows machine with the Linux version.
Merging changes.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	main.cpp
	src/Graphics/Camera.hpp
	src/ShaderUtil.h

I should really push all changes before working on a different computer.
Merged.
Switching to GLM basically broke everything. Will either fix or revert.