workspace
Merge branch 'master' of https://github.com/fauverism/Responsive-Form-Template

Conflicts:
	.idea/workspace.xml