ignore files
Merge remote-tracking branch 'origin/1_vagrant_set_up' into 1_vagrant_set_up

Conflicts:
	.gitignore