Guild refactor

[craineum]

Removed documentation so we can clean it up later. Moved a spec that was out of place for hot. Added objects for guild requests and results.

[jemiahlee]

please rebase this so that I can review it a little easier. :) thanks!

[craineum]

Had issues with the rebase, so ended up doing a merge, but the overall results remain the same on what has changed. Sorry about that.

[jemiahlee]

Well, the difference between merge and rebase is in the fact that other people may be using this as well, and merges will complicate their ability to also submit pull requests. Which is an unfriendly way to work on an open-source project.

[jemiahlee]

I'll look at your branch and try to figure out what it is that you did that complicated the rebase. It's probably that there is another merge in here other than the PR that I merged.

[jemiahlee]

And I realize it's academic on this, since there is almost certainly no one else working on the project, but in general on OSS projects, you'll want to make sure you never merge.

[craineum]

No, I completely agree about it. I am learning this, since this is the first OSS I have contributed to. I am lucky to have you helping me break my teeth in on it.

What I did...

git fetch upsteam
git checkout origin master
git rebase upstream/master
git push origin master
git checkout origin guild_refactor
git rebase origin/master

This is where it gave me a "you local has diverged from origin/guild_refactor"

Told me to correct by doing a pull

git pull origin guild_refactor
git push origin guild_refactor

[craineum]

Closing this since it was merged via another pull request from @jemiahlee

[jemiahlee]

All the commits are yours, though! :)

[craineum]

Haha... true :) I am getting back into this, and was just doing some clean-up. Sorry it has taken me so long!

[jemiahlee]

No worries! I've been swamped, I'm managing two teams at work.

Are you going to BGG?

[craineum]

No, Sold out by the time I went to get tickets :(

[jemiahlee]

:-( Oh well, I was hoping to meet you! Maybe next year?

[craineum]

Yes, I plan on going to more board game conventions in the coming year. I have a couple of games I am working on myself.