Merge pull request #19 from Elwend/master

Pull request from Liz
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
Worked on conditional messages