consolidating thinkful code
Merge branch 'master' of github.com:pconroy/thinkful