Merge branch 'master' of git@github.com:iceru/teachers-chores.git

Conflicts:
	TeachersChores/res/layout/btn_addperson.xml
Merge branch 'master' of git@github.com:iceru/teachers-chores.git