resolve conflict
Merge branch 'master' of https://github.com/CrossTheStreams/magneato

:wq:q