latest changes
Merge branch 'master' of https://github.com/andrewsmhay/Agrippa

Conflicts:
	agrippa.rb