Add .gitignore for settings
Merge branch 'master' of https://github.com/V1del/ohsom.git

Conflicts:
	Ohsom/.gitignore