fixed the conflict of render
Merge branch 'master' of https://github.com/zarcen/lifebricks