Added functionality to the navigation bar
Merge branch 'master' of http://github.com/zachyf/cs108quiz

Conflicts:
	src/quiz/userWelcome.java
Revert "Merge branch 'master' of http://github.com/zachyf/cs108quiz"

This reverts commit fe972c187bac9bc28e61c700508aa1109c875e67, reversing
changes made to 0afe10dc799ecc48d9e9aedbca36c3aab1f13717.