Merge pull request #1 from golgistudio/master

Update from master
Update Thinkful projects
Merge pull request #2 from golgistudio/gh-pages

Update from gh-pages