Finished Chap 6
Merge branch 'master' of https://github.com/hilliard/test_puppies

Conflicts:
	.idea/workspace.xml
	features/crud.feature
	features/support/matchers.rb
Begin XML Chapter
Added builder
Zipcodes and Frames