Initial commit
Merge branch 'master' of github.com:nixa/android-travis-test

Conflicts:
	.gitignore