temp change for beta
changing for heroku push
changed routes a little
fixed merge conflict
pushing again because something is wrong with the google analytics: