fixed
Merge branch 'master' of https://github.com/ariarishosho/hackday2014