cleanup
Merge branch 'master' of github.com:jamox/mooc-data-parser

Conflicts:
	lib/mooc_data_parser/app.rb