saves credit card data now
fixed bugs
finished hooking up to user
saves credit card data now
fixed bugs
finished hooking up to user
fixed bug with logging out
finished
Merge pull request #36 from RTakes/conflict-res

Conflict res
Merge pull request #37 from RTakes/conflict-res

fixed homepage padding
Merge pull request #38 from RTakes/conflict-res

updated settings page
Merge pull request #39 from RTakes/conflict-res

updated demo page
Merge pull request #40 from COPPER-BOBCAT/staging

front end merge
Merge pull request #41 from RTakes/conflict-res

Conflict res
Merge pull request #42 from COPPER-BOBCAT/staging

Staging
finished stripe functionality with credit cards
Merge pull request #43 from power9/master

finished stripe
changed back server.js
Merge pull request #44 from power9/master

changed back server.js
style