fix the error stuff
Merge branch 'master' of github.com:deanhiller/playground