Initial commit
Merge branch 'master' of https://github.com/ronaldsmartin/mater-dolorosa-android

Conflicts:
	.gitignore