conflict
Revert "conflict"

This reverts commit 94207664d412be27df19041393521fdcd896ffae.
Merge branch 'master' of https://github.com/magiratex/LocalMania