completed
Merge remote-tracking branch 'origin/master'

Conflicts:
	week_3/6_group_project/tests.js