update routes and tudy up template names
Merge branch 'master' of github.com:teamwinit/yahoohackusa