.idea folder deleted.
Merge branch 'master' of github.com:polandy/quinnie-redo-html-proto

Conflicts:
	.idea/workspace.xml