Merging troubles
Merge branch 'master' of github.com:joosterman/Accurator