fixing merge
fixing conflicts
cuzMerge branch 'master' of github.com:scottmsims/mjolnir