gemfile lock not updated correctly maybe
Merge branch 'master' of https://github.com/nathantross/project2
resotres test suite
added functionality to access fitbit info in all controllers
adds controller specs for basic CDUD app funtionality
Merge pull request #44 from Ryabrandt/helper-methods

Helper methods
fixed conflicts
Merge branch 'master' of https://github.com/nathantross/project2