Added a Unit Test for Users, modified Users
Merge branch 'master' of https://github.com/energyscholar/GravicalBWell

Conflicts:
	nbproject/private/private.properties
	src/com/gravical/bwell/models/User.java