Search is about halfway done.
Merge branch 'master' of https://github.com/jdl39/HappinessTracker
Search mostly done. Error in get activity data method.