merge fixed
Merge branch 'master' of https://github.com/Mattze96/miniblog
Merge branch 'master' of https://github.com/Mattze96/miniblog