init commit
Merge branch 'master' of github.com:daniel-madera/paa-android-ares

Conflicts:
	.gitignore