Updates

Index, Home, Message-Form, Message-List, Profile, Styles
Fixed Merge Error
Updates to Merge Error Fix

Home, Message List
Merge branch 'master' of https://github.com/NateFlynn/ace

Conflicts:
	p/l/home.php
	p/l/message-list.php