maruku -> kramdown
Merge branch 'master' of github.com:CartoDB/cartodb-academy

Conflicts:
	courses/01-beginners-course/lesson-1.md