boilerplate
Merge branch 'master' of https://github.com/jonrovira/hackathon2014