rails new .
editing gems
rails generate devise:install
rails g devise user
rails g devise user
rails generate figaro:install
rails g scaffold Sticker name:string image:string quantity:integer
rails generate friendly_id
rails g migration add_slug_to_stickers slug:string
fixing default find
adding orders
rails g scaffold address primary:string secondary:string city:string state:string post_code:string country:string
rails g scaffold order user:references address:references quantity:integer cost:float
Merge branch 'master' of github.com:wholcomb/sticker_seller

Conflicts:
	.gitignore