stash changes
Merge branch 'master' into tests_v1

Conflicts:
	coverage/.resultset.json
	coverage/index.html
tests for user sign up written and passing
working backbone views for stories list
updated backbone views
working add story with backbone
broken tests, fix tomorrow
more slides, update still broken
working intro and navigation to game start
working start game
working state selection and info response
household size selection working