updated gemfile with UML/ERD diagramming packages
updated gemfiles
Merge branch 'master' into dev
migrations of postcode, dogname, dog image made
resolved merge conflicts
Updated stashed conflicts
deleted erb files
Jody's form page added and working
Rspec code added
first rspec tests running
html application-html worked on, structure mainly there, more work to do
Merge branch 'page-template' into dev
breeder folder in a folder sorted, removed inner foler, moved everything into outer folder