Merge pull request #153 from deadanon/master

MERGE ALL CONFLICTS LIKE A BAUSE
Merge conflict fixes
Merge pull request #154 from Nghinazz/master

Merge conflict fixes
Merge branch 'master' of https://github.com/adboomgrp/lodestar_base
new_commit