edited addUsers to allow for users with emails already registered
changed to null for username
Merge branch 'master' of github.com:thejerrybao/Nimbus

Conflicts:
	admin/processdata.php