Test
Improved readability
Added fields for location(Country, City)
Update userInfo.java

Improved readability
Added fields for location(country, city)
Update User.java

Readability, and added a field for email address, which is required when a user registers.
Merge branch 'master' of git@github.com:Zackeree/Group320.git
Merge remote-tracking branch 'zack/master'