commit to merge
Merge branch 'master' of https://github.com/pshen0/manbearpig
fixed errors for compile
Merge branch 'master' of https://github.com/pshen0/manbearpig