up

up
Merge branch 'master' of https://github.com/niltors/AndroidStudioProjects

Conflicts:
	.gitignore