Merge remote-tracking branch 'origin/master'

Conflicts:
	TheDocIsIn/bin/TheDocIsIn.apk
	TheDocIsIn/bin/classes.dex

	TheDocIsIn/bin/classes/com/example/thedocisin/AnswerQuestionActivity.class
	TheDocIsIn/bin/classes/com/example/thedocisin/AnswerViewAdapter.class
	TheDocIsIn/bin/classes/com/example/thedocisin/AskQuestionActivity.class
	TheDocIsIn/bin/classes/com/example/thedocisin/Logger.class
	TheDocIsIn/bin/classes/com/example/thedocisin/MainActivity$1.class
	TheDocIsIn/bin/classes/com/example/thedocisin/MainActivity$2.class
	TheDocIsIn/bin/classes/com/example/thedocisin/MainActivity$3.class
	TheDocIsIn/bin/classes/com/example/thedocisin/MainActivity$4.class
	TheDocIsIn/bin/classes/com/example/thedocisin/MainActivity$5.class
	TheDocIsIn/bin/classes/com/example/thedocisin/MainActivity$6.class
	TheDocIsIn/bin/classes/com/example/thedocisin/MainActivity.class
	TheDocIsIn/bin/classes/com/example/thedocisin/ProfileActivity.class
	TheDocIsIn/bin/classes/com/example/thedocisin/QuestionList.class
	TheDocIsIn/bin/classes/com/example/thedocisin/QuestionListAdapter.class
	TheDocIsIn/bin/classes/com/example/thedocisin/QuestionView.class
	TheDocIsIn/bin/classes/com/example/thedocisin/R$id.class
	TheDocIsIn/bin/classes/com/example/thedocisin/R$layout.class
	TheDocIsIn/bin/classes/com/example/thedocisin/R$menu.class
	TheDocIsIn/bin/classes/com/example/thedocisin/R$string.class
	TheDocIsIn/bin/classes/com/example/thedocisin/RegisterUser$1.class
	TheDocIsIn/bin/classes/com/example/thedocisin/RegisterUser.class
	TheDocIsIn/bin/resources.ap_
	TheDocIsIn/gen/com/example/thedocisin/R.java

Layout Updates

-New MainActivity Layout, Not great...but cleaner
-Made
a second layout for the login screen. Have not set the new layout.
Want
to show you guys first
-Working on more layouts for other screens