Removed liquid tags on Monsterporium tutorial
Fixed merge conflicts