Merge pull request #48 from lapty/master

asdfasdf
pulling
fixed conflicts
Merge pull request #49 from wgallop99/master

pulling
changed routes