+ .gitignore
Merge branch 'master' of https://github.com/larsgrefer/android-library

Conflicts:
	.gitignore