Changes
Merge branch 'master' of github.com:bskelty/the_hard_way