remove workspace file from tracking
Edit gitignore global
Merge remote-tracking branch 'origin/create-bootstrap-form-helper' into create-bootstrap-form-helper

Conflicts:
	.idea/workspace.xml
Edit gitignore global