Seperated the html files from client.html
None
Merge branch 'userNavbar'
Seperated the templates to individual html files

Conflicts:
	client/.DS_Store