Merge branch 'master' of https://github.com/matthew-compton/RPS

Conflicts:
	.gitignore