Proprietary sign in
Proprietary sign in [2]
Merge branch 'master' of https://github.com/camilin87/senior_project.git

Conflicts:
	application/config/autoload.php
	application/controllers/homecontroller.php
	application/views/template_header.php
merging changes