Login Working now
WorkingOnLoginThings
newThingsToAdd
NewUpdates
Merge pull request #174 from hzahoori/workingOnLoginThings

Working on login things
Lily's changes

Conflicts:
	config.php
Merge branch 'Tarboz_w4' of https://github.com/lilyfan/Tarboz into Tarboz_w4

Conflicts:
	views/shared/header.php
	views/shared/search.php
commit after squash