committing to allow the merge to happen, but calculate is junk
Stash away old dumb files
Storing merged files
Merge branch 'master' of https://github.com/lukasgemar/web
Merge branch 'master' of https://github.com/lukasgemar/web
Merge branch 'master' of https://github.com/lukasgemar/web
Merge branch 'master' of https://github.com/lukasgemar/web
Trying to get rid of binary files