Initial commit
Merge branch 'master' of github.com:Weeesh/Weeesh-Android

Conflicts:
	.gitignore