added exceptions to database, cleaned up queries
Merge remote-tracking branch 'origin/master'

Conflicts:
	signup.php
Cleaned up some text
Merge remote-tracking branch 'origin/Pre-Live'
Updated Styles and Sign Up page
Merge to Master
Fixing Merge Conflict

Conflicts:
	css/style.css
yolo
Fix Conflict Attempt #2
Updated Sign Up page