Initial upload
pelican tweak
Merge branch 'master' of https://github.com/vrih/c

Conflicts:
	.gitignore