some fixs
Merge branch 'master' of github.com:surikat/udac.dev