Final Commit for week 2
Merge remote-tracking branch 'origin/master'
Final run through before submission