something
Merge branch 'master' of github.com:vaughanj10/caloriety

* 'master' of github.com:vaughanj10/caloriety:
  Added Devise controller
  Updated gitignore
  Updated gitignore
  Added figaro
Merge branch 'master' of github.com:vaughanj10/caloriety

* 'master' of github.com:vaughanj10/caloriety:
  Annotated routes
  Fixed routes again
  Fixed routes
upgraded to rails 4