forgot psw page fixed
updated readme
fixed merge issue
Merge branch 'master' of github.com:chartist/chartist into navbar-logo