Fixed user conflict
Merge branch 'mail-notify' of https://github.com/adairdavid/SENG403G1 into mail-notify

Conflicts:
	app/models/user.rb