commit challenge 3 and 4 for week 7
week 7 challenges 3 and 4

Conflicts:
	week_7/3_model_one_to_many_solo_challenge/my_solution.md