can add questions
Merge branch 'master' of github.com:macfarlandian/data-question-thing

Conflicts:
	client/templates/angular-setup.js