update
Merge branch 'master' of https://github.com/tim2819/phase_0_unit_1

Conflicts:
	week_2/2_Intermediate_HTML_CSS/readme.md
	week_3/5_group_project/my_solution.js
	week_3/9_gps1_2/our_solution.js