deleted trash from repo
build system done
Merge remote-tracking branch 'tattooist/master' into Dockerfile
fix
Merge remote-tracking branch 'tattooist/master' into Dockerfile
vagrant
vagrant
Собираем со сборкой
Merge remote-tracking branch 'tattooist/master' into Dockerfile

Conflicts:
	bootstrap.sh