merging files
Merge branch 'master' of heroku.com:dailydeed

merging files from jons update
Merge branch 'master' of heroku.com:dailydeed

merging files
Merge branch 'master' of heroku.com:dailydeed

merging changes mother's day
Merge branch 'master' of heroku.com:dailydeed

merging beta changes
adding what i did to public folder, and a couple aesthetic changes
Merge branch 'master' of github.com:crowdpublishtv/beta

merging with github