qwe
Merge branch 'master' of https://github.com/stonemonkey/AutoMate

Conflicts:
	AutoMate.sln