dumb commit
merge
minor changes
added empty ultimate functionality
merge
combined category pages. Added email functionality. Bug fixes.
merge
merged georges and fixes error messages in admin
error message divs added
merge
merged matt's changes
fixed buttons on admin panel
a few changes to design