Changed git ignore
Android base ignoring bad files
Merge branch 'master' of https://github.com/weshack/graffiti

Conflicts:
	.gitignore
Android stuff