Updates design of base-page.html to base.html with highlights and redesigned header.
Updates design of base-page.html to base.html with highlights and redesigned header.
Merge remote-tracking branch 'origin/Mic'

Conflicts:
	main/index.php
Merge remote-tracking branch 'origin/master'
Adds chat.html page and updates script.js
Updates highlights with comment sections and improves chat.
A user on a base page will update time of view in user_base table.
Merge remote-tracking branch 'origin/master' into Charlie

Conflicts:
	main/html/user-profile.html
	main/index.php
	main/js/script.js
Merge remote-tracking branch 'origin/master' into Ke

Conflicts:
	main/base_page.php