End of week 7 commits
Actioned comments from Brandon Conway
Merge pull request #8 from asatwal/week_7

End of week 7 commits