Testing for an error

no error here!
Merge branch 'master' of https://github.com/jakesyl/helloworldamongothers