fixed broken image links
Merge branch 'master' of https://github.com/s-loar/Divvy_Up into Lienha

Conflicts:
	db/seeds.rb
	log/development.log
Merge pull request #56 from s-loar/Lienha

fixed broken image links
fixed broken image links
Merge pull request #57 from s-loar/Lienha

fixed broken image links
resized images
Merge pull request #58 from s-loar/Lienha

resized images
Merge pull request #59 from s-loar/JennieO23

got the divvy api working! YAY!
comments without ajax
routes incomplete
merge problems again
routes incomplete
Merge pull request #61 from s-loar/Lienha

routes incomplete
took of comment on this resource, and made users signin to post comments