Comitting a swear word.
Merge remote-tracking branch 'origin/Spencer_Branch' into Spencer_Branch
Fuck you
Ignoring bin files
Merge branch 'master' into Spencer_Branch

Conflicts:
	.gitignore