Merge branch 'master' of https://github.com/GNC-student-projects/Sightseeing

Conflicts:
	app/app.iml
	app/src/main/java/gncstudentprojects/sightseeing/Sightseeing.java