update router
move routes into their own file for sanity's sake
Merge branch 'master' of github.com:woodall/goals

Conflicts: