gitignore update
change git ignore
Merge branch 'master' of https://github.com/mahyamaftouni/TG

Conflicts:
	app/controllers/classroom.js
	app/controllers/school.js