updated everything
Merge branch 'master' of github.com:jfernandez/wheres-da