commit the temp
Temp

percival added to the file!
Merge branch 'master' of https://github.com/DrJamesHenrey/QuestionOfTheDayApp

Conflicts:
	bin/classes/cse/asu/questionoftheday/AnswerPageActivity$1.class
	bin/classes/cse/asu/questionoftheday/AnswerScreenActivity$1.class
	bin/classes/cse/asu/questionoftheday/AnswerScreenActivity.class
	bin/classes/cse/asu/questionoftheday/CreateQuestionActivity$1.class
	bin/classes/cse/asu/questionoftheday/CreateQuestionActivity.class
	bin/classes/cse/asu/questionoftheday/LoginActivity$1.class
	bin/classes/cse/asu/questionoftheday/ManageQuestionsActivity.class
	bin/classes/cse/asu/questionoftheday/NewQuestions.class
	bin/classes/cse/asu/questionoftheday/ProfessorHomeActivity.class
	bin/classes/cse/asu/questionoftheday/QestionDetailsActivity$4.class
	bin/classes/cse/asu/questionoftheday/QuestionsScreenActivity.class
	bin/classes/cse/asu/questionoftheday/StatisticsScreenActivity.class
	bin/classes/cse/asu/questionoftheday/StudentHomeActivity.class
	bin/classes/cse/asu/questionoftheday/StudentRosterActivity$4.class
	bin/classes/cse/asu/questionoftheday/StudentRosterActivity$5.class
	bin/classes/cse/asu/questionoftheday/StudentRosterActivity.class
	bin/classes/cse/asu/questionoftheday/TopicHomeActivity.class
	bin/classes/cse/asu/questionoftheday/model/Question.class
	bin/classes/cse/asu/questionoftheday/model/Section.class
	bin/classes/cse/asu/questionoftheday/model/StatQuestion.class
	bin/classes/cse/asu/questionoftheday/model/User.class