Salt theoretically done
Merge branch 'master' into Login
asdf
Merge pull request #16 from kmblake/Login

Login
finished all quiz and question classes
now actually finished
Merge branch 'master' into Quiz-class-updates-Eric
Merge pull request #17 from kmblake/Quiz-class-updates-Eric

Quiz class updates eric
Merge branch 'master' into bryant-branch

Conflicts:
	Quiz Website/src/quiz/AccountManager.java
	Quiz Website/src/quiz/Quiz.java