first commit
Merge branch 'master' of https://github.com/groverz/droidapad

Conflicts:
	.gitignore