initial android project
Merge branch 'master' of https://github.com/ncroll/shed-jewel

Conflicts:
	.gitignore