Milestone 2
Merge branch 'master' of https://github.com/mrl1n/UniversityTour