First Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Fixing .ignore for the MSVC project