added file upload function
Merge branch 'master' of https://github.com/SecureCodingTeam7/Phase1

Conflicts:
	phase1/class/c_user.php
	phase1/login.php