challenge complete
merged
Merge branch 'matte_dev' into staging
incremented version number
Merge pull request #11 from mattjbarlow/staging

second pull request for challenge 2