front-end changes
Merge branch 'master' of https://github.com/brianashpugh/soundsift
feed designs
Merge branch 'views_branch'
quick fix
changed the file structure so urls would process correctly