Initial commit
Merge branch 'master' of github.com:tekguy/pickem

Conflicts:
	.gitignore