Redid Welcome Page

I changed the code back to the new welcome page (again). I didn't make a
new activity for the alarms since I don't know how Jimmy intends to add
them in yet.
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/MealTracker1.apk
	bin/classes.dex
	bin/classes/com/example/mealtracker/FifthActivity.class
	bin/classes/com/example/mealtracker/FirstActivity.class
	bin/classes/com/example/mealtracker/FourthActivity.class
	bin/classes/com/example/mealtracker/MainActivity.class
	bin/classes/com/example/mealtracker/R$drawable.class
	bin/classes/com/example/mealtracker/R$id.class
	bin/classes/com/example/mealtracker/SecondActivity.class
	bin/classes/com/example/mealtracker/ThirdActivity$1.class
	bin/classes/com/example/mealtracker/ThirdActivity.class
	bin/resources.ap_
	gen/com/example/mealtracker/R.java
	res/layout/activity_main.xml