changed routing
Merge pull request #20 from rangle/moveToMain

changed routing