add gitignore
fix changes
Merge branch 'master' of https://github.com/DsXack/vagrant-box-ubuntu-1204-php53

Conflicts:
	bootstrap.sh