.gitignore modified
Merge branch 'master' of https://github.com/zinsaf/Project-LMS

Conflicts:
	.gitignore