baseurl
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
tMerge branch 'master' into gh-pages
testin siteurl
wtf
adding order attribute to pages
order
empty commit
Merge branch 'master' of github.com:CartoDB/academy
fix
Merge branch 'master' of github.com:CartoDB/academy
Merge branch 'master' of github.com:CartoDB/academy

Conflicts:
	_layouts/course.html
	_layouts/lesson.html
Merge branch 'master' of github.com:CartoDB/academy

Conflicts:
	_layouts/course.html
	_layouts/lesson.html