Fix include path
Fix gitignore, DON'T COMMIT THIS FILE AGAIN
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore