first code review with nick :)
Merge pull request #1 from emmettnicholas/master

first code review with nick :)