Initial Commit of Android Stuff
Merge branch 'master' of github.com:omjolie/pretty-magic

Conflicts:
	.gitignore