did git pull to catchup to group repo
landing page stuff
Merge branch 'master' of https://github.com/brucetoddlee/good_or_evil

git commit -m "trying to catchup to group to add my code"
user can submit picture or none, working on if no text.
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
Merge branch 'master' of github.com:brucetoddlee/good_or_evil
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
Merge branch 'master' of github.com:brucetoddlee/good_or_evil