init commit
Merge branch 'master' of github.com:cryptodroids/cryptodroid

Conflicts:
	.gitignore
updated gitignore
update ignore