More Quiz Generation Updates
Merge branch 'master' of https://github.com/macguy2010/QuizBuilder

Conflicts:

QuizBuilderProject/src/main/java/com/nate_tim_dane_company/quizbuilderpr
oject/LoginController.java
	QuizBuilderProject/src/main/webapp/loginPage.xhtml
	QuizBuilderProject/src/main/webapp/quizGenerationPage.xhtml
	QuizBuilderProject/target/QuizBuilderProject-1.0-SNAPSHOT.war

QuizBuilderProject/target/QuizBuilderProject-1.0-SNAPSHOT/WEB-INF/classe
s/com/nate_tim_dane_company/quizbuilderproject/LoginController.class

QuizBuilderProject/target/QuizBuilderProject-1.0-SNAPSHOT/WEB-INF/classe
s/com/nate_tim_dane_company/quizbuilderproject/QuizGenerationController.
class

QuizBuilderProject/target/QuizBuilderProject-1.0-SNAPSHOT/loginPage.xhtm
l

QuizBuilderProject/target/QuizBuilderProject-1.0-SNAPSHOT/quizGeneration
Page.xhtml
	QuizBuilderProject/target/maven-archiver/pom.properties

QuizBuilderProject/target/maven-status/maven-compiler-plugin/compile/def
ault-compile/createdFiles.lst