# 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
Added comments, added about to homepage, and edited style for homepage.
fix merge conflict over a comment. thanks git

Conflicts:
	static/app/controllers/quizCtrl.js
grades tinkering commence
grades work with base64 bull auth
answer expects json body, see session.go
Merge branch 'master' of github.com:michellefish/flaming-wookie into fish-master
reverted front page, otherwise merged

the footer does not abide
Merge branch 'fish-master'

Conflicts:
	session.go
added handler to delete quiz
added correct answer selection, inserting actual title of quiz in db
instead of "Test"

quiz slide working, sending requests to quiz sesh on the server
added grades object to quiz model
somehow merged this in under an hour

Conflicts:
	api.go
	models.go
	session.go
	static/app/controllers/quizCtrl.js
	templates/partials/quiz-form.html
	templates/partials/quiz.html
front end fiddling
the changes you were looking for
readded home page
add error to success: false
dashboard changes, new look
Merge branch 'roberthorn-master'
revert css