hello from jack
Merge origin/master

Conflicts:
	lib/thelib.rb
again
Merge origin/master