Added images to play around with
Merge branch 'master' of github.com:pmills88/Project-2
Added Twilio API gem, texting capability template, user cell migration, and required cell to sign up
Merge pull request #18 from Elwend/master

Pull request from Liz
Added Twilio secrets
Fixed syntax on send_messagemethod
Merge branch 'master' of github.com:pmills88/Project-2
Merge pull request #19 from Elwend/master

Pull request from Liz
Added messaging.rb model
Merge pull request #20 from Elwend/master

Liz
Add wind and description to user model
Fix merge conflicts
Merge pull request #21 from brandonjyuhas/update_user

Add wind and description to user model
Add hot cold to user
Merge pull request #24 from brandonjyuhas/seed

Add hot cold to user
Bugfixes
Possible bugfix
Merge pull request #25 from pmills88/SideBar2

Side bar2
Worked on conditional messages
Changed user methods to correspond with the database