Multiple update
Merge branch 'master' of https://github.com/vitascrazy/school

Conflicts:
	task.todo