finalize added
Merge branch 'master' of github.com:chrisjleaf/plannedParenthood

Conflicts:
	controllers/question_controller.js