manually merged getData code in controller
Merge branch 'master' of https://github.com/RightHereRightNow/RightHereRightNow.github.io