mylibchris
Merge origin/master

Conflicts:
	lib/thelib.rb