Initial commit
Merge branch 'master' of https://github.com/tomviner/teaching-computing

Conflicts:
	.gitignore
Ignore swap files
Sample index