blah
Merge branch 'master' of ssh://github.com/evalentini/actprep

Conflicts:
	app/assets/javascripts/answer_record.js
Merge branch 'master' of ssh://github.com/evalentini/actprep
Merge branch 'master' of ssh://github.com/evalentini/actprep
fixed issue #19 with @maxquestion being nil