update settings
Merge branch 'master' of git@github.com:jea0501/exam.git

Conflicts:
	.gitignore