asd
qwe
Merge branch 'master' of https://github.com/ichyr/cathedral
qwe
resolved conflict
resolved conflict with master