AUTOCOMMIT: Sun Jul 20 11:04:31 PDT 2014
Merge branch 'master' of github.com:zafartahirov/setup

Conflicts:
	setup.sh