integrated with matt & jennifer's templates
tweaks to css & logic
heroku and css stuff
Merge pull request #1 from josephrmoore/integration

Integration