New branch

before we all agree on the changes, please push files to development
branches. Also, before pushing any files, please send message to all of
us so that one commit won’t be covered by other commits
Added activity 3 and 4
Merge branch 'development'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/com/example/mealtracker/MainActivity.class
	bin/classes/com/example/mealtracker/R$id.class
	bin/classes/com/example/mealtracker/R$layout.class
	bin/classes/com/example/mealtracker/R$menu.class
	bin/classes/com/example/mealtracker/R$string.class
	gen/com/example/mealtracker/R.java
	res/values/strings.xml