pulled from upstream
Merge branch 'master' of github.com:fijimunkii/hintr
Merge branch 'master' of github.com:fijimunkii/hintr
fixed coffee script for the login
fixed merge conflict