test
Merge pull request #5 from garrettlord/master

Home, users, and groups
Merge branch 'master' of github.com:garrettlord/TSP_Project into dddiehn
Basic bootstrap
Added basic bootstrap
Merged changes
Merge pull request #12 from garrettlord/dddiehn

Added basic bootstrap
Merge branch 'master' of github.com:garrettlord/TSP_Project
Added basic weather api integration
Merge pull request #14 from garrettlord/garrettlord

Added basic weather api integration
Added the gems for weather
Merge pull request #15 from garrettlord/garrettlord

Added the gems for weather
Added Movie API integration
Merge pull request #18 from garrettlord/garrettlord

Added Movie API integration
Merge pull request #19 from garrettlord/btgaffor

Using Garrett's twilio
Merge branch 'master' of github.com:garrettlord/TSP_Project