merge conflicts fix
Merge branch 'master' of https://github.com/pahgawk/moarti.me