Updated readme and added new program.
Merge branch 'master' into test2
Committing after a merge.  Not sure I resolved it correctly.

Conflicts:
	README.md
Merge branch 'test2'
Resolving merge conflicts.