initial commit
ignored gradle config files
Merge branch 'master' of https://github.com/khipu/khipu-demo-android

Conflicts:
	.gitignore