added our solution from my branch
initial commit week 6
Merge remote-tracking branch 'origin/master' into individual/bartol