ignore sublime stuff
Merge branch 'master' of https://github.com/Viehauktion/viehauktion

Conflicts:
index.php