Merge branch 'tomato'

Conflicts:
	guacamole.txt
Merge branch 'master' of https://github.com/felixsoum/guacamole

Conflicts:
	guacamole.txt