ready for heroku deploy
updating website content for the new build (work in progress)
merged server changes
updating site for new version; working on redesign