added stripe gem"
added stripe env variables
added stripe js and key
added key comments
added stripe token to user model
added payment model
added associations
changed association
resolved merge conflicts
fixed merge conflicts
merge conflicts in lock
typo
added association
added payments controller
add route
getting ready to add stuff
merge conflicts
added js file
added grant/route work
plural error