erd diagram added
Update README.rdoc
Update README.rdoc
made all factories
Merge pull request #5 from Mcscott142/factory_maker

made all factories
fixed type error in factory
fix conflict on beer