Update 2
Merge branch 'master' of https://github.com/physiocontrol/testing

Conflicts:
	my-cup-of-tea.jpg