edit stuff
edit
added routes
Merge branch 'master' of https://github.com/cheezedigital/digital_grooves
added changes from master