Hopefully compiling again
added .gitignore, removed some files that didn't need to be tracked.
Merge branch 'master' into develop

Conflicts:
	.gitignore