ignore .settings/
ignore more files
merge conflict gitignore
Merge pull request #1 from blaedj/origin/wrap-logging-page

Origin/wrap logging page