changes to dashboard and all
Merge branch 'master' of github.com:anbublacky/nthat
changes to step1 and 2 page
merge conflict solved