fixes #5
Merge branch 'master' of github.com:CartoDB/academy