...
Merge branch 'master' of https://github.com/digovc/getemp

Conflicts:
	Getemp.suo