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