Step 1 on using shared templates
Merge remote-tracking branch 'origin/working' into working
Step 1 on using shared templates
Merge branch 'master' into working

Conflicts:
	templates/home.html
temp checkin of header bar work.
Added header across all pages.