vagrantify
Merge branch 'master' of github.com:CodeCatz/litterbox

Conflicts:
	README.md