adding master entry in slaves' hosts file
Merge branch 'master' of github.com:pkoperek/mesos-plgrid

Conflicts:
	slave_setup.sh