Updated things to ignore
Merge branch 'master' of github.com:fluffyfreak/OculusOpenGLSDL2 into Shapes

Conflicts:
	Hills/Hills.cpp
Merge branch 'Shapes' of github.com:fluffyfreak/OculusOpenGLSDL2 into Shapes