Commented out routes to try to debug server issue
Merge branch 'master' into working_with_mike
Merge pull request #33 from edatrix/working_with_mike

Working with mike