no more glm warnings
Merge branch 'incoming'

Conflicts:
	src/rendering/uniform.cpp
Merge branch 'incoming'
Fix typo
Merge pull request #26 from Anonymooseable/fix-typo

Fix typo
Merge branch 'incoming'
Merge branch 'master' of github.com:therocode/featherkit
Merge branch 'incoming'
Added native CPU optimization options to CMake
Merge pull request #51 from Mischa-Alff/native_compiler_optimizations

Added native CPU optimization options to CMake
added 3.2 context
Merge branch 'incoming' of ssh://pallkars.net/featherkit into incoming
Merge branch 'incoming' of github.com:therocode/featherkit into incoming
Merge branch 'master' of github.com:therocode/featherkit into incoming

Conflicts:
	CMakeLists.txt
using const instead of constexpr