generate basics
basics
Users controller and basic model
setup migrations
Merge branch 'master' of https://github.com/eubenesa/romanchukenator into user-auth
add vendors resources
add methods on vendors controller
methods on prices controller
ads
Merge branch 'master' into stripe
Merge pull request #1 from eubenesa/jill-add-methods-to-vendors-controller

Jill add methods to vendors controller
Merge branch 'master' into stripe
User creation, sign in, token, etc.
Merge branch 'master' of https://github.com/eubenesa/romanchukenator into user-auth

Conflicts:
	config/routes.rb
Merge pull request #2 from eubenesa/user-auth

User auth
begin deploy
Merge branch 'master' of github.com:eubenesa/romanchukenator
Merge branch 'master' into stripe
added stripe gem