Modified "undo" word
Merge branch 'master' of github.com:billsinc/brioche

Conflicts:
	server.rb