routes updated
Merge pull request #5 from fishermanswharff/master

routes updated with users