indentation update
conflict update

Conflicts:
	week_6/1_assert_statements/my_solution.rb
	week_6/3_BoggleBoard/my_solution.rb
Merge branch 'master' of https://github.com/hinghuynh/phase_0_unit_2