WIP first attempt at uc 12
better json
more json changes; update readme
Merge pull request #27 from waingram/gh-pages

first attempt at uc 12
Some git(hub) mysteries on an ignore file not being uploaded...
Merge branch 'gh-pages' into filtered-templates

Conflicts:
	.gitignore