Initial commit
My first proper commit

This time without my notes.org file.
Fixed merge conflict, and changed .gitignore