Added credit card form as a partial to users/show. Renamed users/edit to follow rails partial convention.
Merge branch 'master' of https://github.com/makersacademy/antisocialnetwork
fixed rendering bug in Activities controller