Remove password.php from the repo, but not the folder --Thomas
Merge branch 'master' of github.com:ngiramolaulia/itc240-2014

Conflicts:
	mysql_assignment/password.php
Add .gitignore and transfer up to Github --Thomas