cross browsing + syntax
Merge branch 'master' of github.com:CartoDB/cartodb-academy

Conflicts:
	css/about.css
	css/course.css
	css/lesson.css