ran rails-api new
Added front-end template with custom logos
Removed front end files from back end folder
ran rails g model for Product and Category; edited migration file such that product belongs_to category
ran rake db:create db:migrate
added rails_12factor gem and ruby version to gemfile for heroku
created models for Option, Order, Lineitem
edited migrations files and ran rake db migrate
created empty controllers for models
Merge pull request #1 from ShaynaCummings/create_app

created app; created five basic models & migrations; add gems for deployment to heroku
Merge branch 'master' of github.com:GeoAvShay/bobs-bagels-ecommerce
fixed associations and added join tables for lineitemoptions and productoptions
added show/index actions in controllers and routes for Products and Categories
added seeds
added nested routes with controller actions for products and categories
modified migrations to reflect schema we drew out on board and reset/reseeded database; changed category model to support nesting
updated routes and seeds for nested categories; updated lineitem and option and product models with the has_many through associations
Merge pull request #2 from ShaynaCummings/new_models

New models
Merge pull request #1 from ShaynaCummings/new_models

New models
added some stuff to controllers