First commit, I'm in class 4b
Merge branch 'master' of github.com:miguelSantirso/android_udacity_course

Conflicts:
	.gitignore