jessica pfenning
Merge branch 'master' of
https://github.com/c0mpas/MobileAppDevelopment.git

Conflicts:
	TaskList/AndroidManifest.xml
	TaskList/res/layout/activity_main.xml
	TaskList/res/menu/main.xml
	TaskList/res/values/strings.xml
	TaskList/src/com/example/tasklist/MainActivity.java
	TaskList/src/com/example/tasklist/OrmDbHelper.java