# This is a combination of 2 commits.
# The first commit's message is:

added grades object to quiz model

# This is the 2nd commit message:

fixed issue with inserting $$hashkey into database json, small changes
to templates
fix merge conflict over a comment. thanks git

Conflicts:
	static/app/controllers/quizCtrl.js