demo project
Merge branch 'master' of github.com:initso/eSchool

Conflicts:
	README
test