messing up stuff
Merge branch 'master' of https://github.com/Stefandasbach/splat
Add to gitignore