Ignoring bin files
Merge branch 'master' into Spencer_Branch

Conflicts:
	.gitignore