modified gitignore
Merge branch 'master' of github.com:vskarich/tutoring_site
Merge branch 'master' of github.com:vskarich/tutoring_site

Conflicts:
	.gitignore