merge conflict solved
Changed test
Merge branch 'master' of github.com:chartist/chartist
added omniauth
Fixed merge issues