added workshop proposals
STILL CONFUSED
so very confused
I JUST WANT TO PUSH THIS STUFF DUDE
.DS_Store banished!
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore