final commit heading home
final commit heading home
Merge branch 'master' of https://github.com/Narimm/OpenConnect.git

Conflicts:
	site/views/profile/html.php
worked on a few views  and moved files to correct locations