everything works now
Merge branch 'master' of https://github.com/clffamily/csc309-A3

Conflicts:
	estore/application/controllers/email.php