added contact form, aaron is awesome
email crap
content added to production db and front end questions answered
fixed merge conflicts