merging files
Sunday's call stuff
Merge branch 'master' of heroku.com:dailydeed
Merge branch 'master' of heroku.com:dailydeed

merging jons changes again!
changing caption styles on slider so more content about website is explained with links to main pages
cleaned up a few things with user, added default location if not provided
fixed cancan call to call specific project, not just model project
Merge branch 'master' of heroku.com:dailydeed
accordion plus preliminary styles for projects filter