Revised Solution
Merge branch 'master' of https://github.com/Tim2819/phase_0_unit_3

Conflicts:
	week_7/7_gps3.1/our_solution.rb