saving local changes
 fixed merge conflicts
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
pointless save
 fixed merge conflicts
minor changes
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
merged
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork
Merge branch 'master' of github.com:thegoodnetwork/thegoodnetwork