example assignment
Merge branch 'master' of https://github.com/rpatters/progfun

Conflicts:
	.gitignore