Scaffolded customer and charges resources, set up customer to have many charges.
A couple of commits in, I realized I had set up the resources wrong. I had named the customers resource users. So I checked out a commit on master before scaffolding the resources, and cut a new branch to re-do it. Then I did it correctly on the new branch, scaffold-customers-and-charges, then reset the master to the point where I had cut the scaffold-customers-and-charges branch. Finally, I merged the scaffold-customers-and-charges branch into master, and tried to push. But I couldn't because my local master was behind the remote master. So I pulled the remote master and resolved the conflicts. I should have just merged in the first place :)
Conflicts:
	source/store/app/models/charge.rb
	source/store/config/routes.rb
	source/store/db/schema.rb