bug with maruku and empty iframe tags wtf
update readme, close #39
home: fix firefox input, close #61
Merge pull request #62 from CartoDB/feature/readme

update readme, close #39
Merge pull request #63 from CartoDB/fix/firefox-input

home: fix firefox input, close #61
course links fixed
Merge branch 'master' into gh-pages
config
Merge branch 'master' into gh-pages

Conflicts:
	_config.yml
Merge branch 'gh-pages' of github.com:CartoDB/cartodb-academy into gh-pages

Conflicts:
	.gitignore
	_config.yml