modify gitignore
Merge branch 'master' of github.com:KevinC1118/Monocle into dev

Conflicts:
	.gitignore