added gitignore

this time for the master
fixed merge conflict
Merge remote-tracking branch 'origin/bas'
initial project setup, including glut
initial project setup, including glut (correct)
Merge branch 'master' of github.com:lshoek/realimaze into bas

Conflicts:
	Realimaze/Realimaze.sdf
	Realimaze/Realimaze/Realimaze.vcxproj
	Realimaze/Realimaze/Realimaze.vcxproj.filters
	Realimaze/Realimaze/main.cpp