Merge branch 'master' of github.com:brucetoddlee/good_or_evil
Merge branch 'master' of github.com:brucetoddlee/good_or_evil
landing page stuff
can handle uploaded image or blank image
Merge pull request #50 from peasantpalate/calvin_blank_image_handler

Calvin blank image handler
can handle no text during upload
Merge pull request #51 from peasantpalate/calvin_blank_image_handler

can handle no text during upload
landing page fixes
merging joels changes
further updating joels change
merging joel and calvins code
removed images in public uploads
resolved heroku errors
resolved the js errors
added user profile charts
deleted dump.rdb
Merge branch 'master' into user_profile

Conflicts:
	dump.rdb
post create method mostly in workers