init
Merge branch 'master' of https://github.com/zaraguo92/teaching-system

Conflicts:
	.gitignore