corect template
Merge branch 'master' of https://github.com/prestidigitator92/hackathon_2014