Merge branch 'master' of https://github.com/adboomgrp/lodestar_base
Merge branch 'master' of https://github.com/adboomgrp/lodestar_base
new_commit
Merge pull request #155 from deadanon/master

merge conflict