Hopefully this works
Merge branch 'master' of https://github.com/jeche/dehackathon2
Merge pull request #23 from otorres86/master

final version