create controller methods and routes
Merge pull request #2 from peasantpalate/calvin_devise

Calvin devise added
Merge pull request #3 from peasantpalate/calvin_post_model_with_photo

Calvin Post model with photo. Carrierwave should be working with Amazon for image uploads/display.
resolved routes conflict
user post comment model setup. relationship is set
Like model set up. relationship works
Merge pull request #5 from jongmini/models

Models
first pass at newsfeed index view
created seed file
Merge pull request #6 from brucetoddlee/newsfeed_index

first pass at newsfeed index view
Merge pull request #7 from jongmini/seed_data

created seed file
image added to seed
Merge pull request #8 from jongmini/image_seed

image added to seed
seed images working
Merge pull request #9 from jongmini/seed_edit

seed images working
removed extra create method in posts controller
Merge pull request #10 from brucetoddlee/remove_extra_create_method

removed extra create method in posts controller
file uploads should work with the group changes