Updated contact page
Merge branch 'master' of https://github.com/ProjPossibility/2014-CSUN-CareTaker-1

Conflicts:
	app/views/index.php