arya c9ommit
Merge branch 'master' of https://github.com/neketka/School-in-a-box

Conflicts:
	School-In-A-Box/Main.py
Revert "Merge branch 'master' of https://github.com/neketka/School-in-a-box"

This reverts commit e2d1fcc7baa8e806935f176304aaab0c76e3d14e.