added .settings file
Merge branch 'master' of https://github.com/freak1n/SRE-Course
Merge branch 'master' of https://github.com/freak1n/SRE-Course
test conflict
test conflict
Merge branch 'master' of https://github.com/freak1n/SRE-Course