added .gitignore
added merges folder... might be necessary
modified git ignore
Merge branch 'master' of https://github.com/j55blanchet/sketchWorld