Merge pull request #5 from DrJKL/master

We should make a style guide.