Blank project with example activity
Merge branch 'master' of https://github.com/gpiffaretti/prototipoAndroid

Conflicts:
	.gitignore