Take two on setting up a git repo for this
Merge branch 'master' of github.com:dweekly/android-reversi

Conflicts:
	.gitignore
	README.md