working on sending email
I hope this is what you want
10/26
Merge branch 'master' of https://github.com/vipulkohli/OurCProject

Conflicts:
	Code/web/forgotPassword.php
	Code/web/index.php
	Code/web/resetemailsent.php
sorry I didn't commit right before