review_model
resolved merge conflicts
Add edit profile page
Review changes
resolved conflict
Merge branch 'master' of github.com:zcid/space_monkey into products
Merge pull request #5 from kudoku/products

added bootstrap to assets
Merge pull request #6 from TopherBlair/master

Reviews model and controller
Merge branch 'master' of github.com:zcid/space_monkey into products
index divs/glpyhs