Quick fix.. last commit :)
Merge branch 'master' of github.com:ellisvlad/zarthian_hackathon