because I have to
Merge branch 'master' of https://github.com/matthew-pulsipher/etsycustomer

Conflicts:
	.idea/workspace.xml
Wrote XML generator. Needs data still.