needs a CONTRIBUTING file about objectstate

[fardog]

on merge strategy:

Contributors should be working in their own forks, with a branch for each feature/bug/enhancement they are working on. PRs should be made from those branches to our master branch.

PRs can be made with commit history (if looking for comments), but after comments (and two +1's from maintainers), they should rebase off current master, squash to a single commit, and force push to their feature branch. PRs will only be merged once squashed down to a single commit.

Maintainers will then merge (via the "big green button") after travis reports back success. Any PR that cannot be merged via the big green button will need to be fixed prior to acceptance.

[fardog]

on rights:

a note on assignment of rights (as is a requirement of the APACHE-v2 license) will probably need to be stated.

[AWinterman]

The advantage of merging via the big green button is that then people get to see that their work was accepted?

[fardog]

they get to see that their work was accepted, and in the commit history you'll see which PRs were merged when, and be able to follow them to the closed PR, where the comments will be preserved. I think this does a few things:

1. Makes it very clear what's made it in
2. Gives people that are looking to contribute a way to see what has been accepted very easily
3. Makes it clear that we accept PRs, and that they make it in (good for community building)

[fardog]

merged #15