changed routes
Merge pull request #50 from lapty/master

changed routes
editing husk menu
Merge pull request #51 from lapty/master

editing husk menu
pulling
fixed conflicts