first commit
Merge branch 'master' of github.com:ziteboard/centos

Conflicts:
	bootstrap.sh