Make this website ready
Merge branch 'master' of github.com:ankushagarwal/vagrant

Conflicts:
	vagrant-centos/init.pp