made work happen
fixed routes
fixed merge conflict (spacing)
Merge branch 'master' of https://github.com/mdotson/MMHackathon
fixed things