init
Merge branch 'master' of github.com:ligi/UnderstAndroid

Conflicts:
	.gitignore