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

Conflicts:
	week_1/1_Get_Started/README.md
	week_1/3_web_basics/readme.md
	week_1/4_beginning_HTML_CSS/readme.md
	week_1/5_HTML_CSS_solo_challenge/readme.md
	week_1/6_technical_blog/readme.md
	week_1/7_cultural_blog.md
	week_1/8_wireframing/readme.md
	week_1/9_get_to_know_your_group/readme.md
	week_1/readme.md
	week_2/1_Chrome_Dev_Tools/dev_tools_quiz.md
	week_2/1_Chrome_Dev_Tools/my_reflection.md
	week_2/2_Intermediate_HTML_CSS/my_reflection.md
	week_2/2_Intermediate_HTML_CSS/readme.md
	week_2/3_Responsive_Web_Design/my_reflection.md
	week_2/3_Responsive_Web_Design/readme.md
	week_2/4_Your_Own_Website_Solo_Challenge/my_reflection.md
	week_2/6_technical_blog.md
	week_2/readme.md
	week_3/1_git_started/my_solution.md
	week_3/1_git_started/readme.md
	week_3/2_code_combat/readme.md
	week_3/3_js_variables_objects/my_solution.js
	week_3/3_js_variables_objects/readme.md
	week_3/4_manipulating_js_objects/my_solution.js
	week_3/4_manipulating_js_objects/readme.md
	week_3/5_design_cc_mission_solo_challenge/my_solution.js
	week_3/5_design_cc_mission_solo_challenge/readme.md
	week_3/6_group_project/my_solution.js
	week_3/6_group_project/readme.md
	week_3/7_technical_blog.md
	week_3/8_cultural_blog.md
	week_3/readme.md