Ignore
Commit a mi repo local
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	res/layout/activity_edit.xml
	res/menu/edit.xml
	res/values/strings.xml
	src/com/paad/todolist/EditActivity.java