Initial repo setup
Merge branch 'master' of https://github.com/amargherio/opencourse

Conflicts:
	.gitignore