Initial commit
Merge branch 'master' of github.com:rjknight123/psychic-bear

Conflicts:
	.gitignore