Fixed #40
Merge branch 'master' of https://github.com/lpissinali/school

Conflicts:
	js/common.js

Fixing #37