Added additional user fields
Merge branch 'master' of github.com:imasonaz/CalHacks