Merge branch 'master' of github.com:brucetoddlee/good_or_evil
Merge branch 'master' of github.com:brucetoddlee/good_or_evil
landing page stuff
landing page fixes
merging joels changes
further updating joels change
merging joel and calvins code