changed something

Signed-off-by: thomasaj91 <thomasaj@uwm.edu>
Edited a couple lines

Signed-off-by: thomasaj91 <thomasaj@uwm.edu>
updated more stuff

Signed-off-by: thomasaj91 <thomasaj@uwm.edu>
Signed-off-by: thomasaj91 <thomasaj@uwm.edu>
Merge remote-tracking branch 'origin/master'

Conflicts:
	ColdCalendars/user/User.php