courses
Merge branch 'master' of github.com:CartoDB/cartodb-academy

Conflicts:
	_posts/2014-03-26-03-maps-for-corporate-comunication.md