Update stuff.
Merge branch 'master' of https://github.com/mdtusz/353-project

Conflicts:
	application/views/login.php