added featured image to rss feed as enclosure
removing a committed merge conflict
removing tablet css affecting mobile and desktop
adding titletag option for blogroll shortcode. defaults to h2
made empty slideshow widgets not appear in html
Merge branch 'master' of ssh://cmsdev/data/marketing/git/uw-2013
changed shortcode <? to <?php for php 5.5 compatibility
Added underline to links when printing
Merge branch 'master' of ssh://cms/data/marketing/git/uw-2013 into kilianf
bug fix. galleries not showing up because wordpress filter would fail on inline html comments
hiding galleries until bug is fixed
bug fix for galleries and their related articles being blank
added rss image size and included that in the rss feed
Merge branch 'master' of ssh://cmsdev/data/marketing/git/uw-2013
fixed problem where old PHP can't go to an index of a returned array
removing leftover print_r output from rss feed
removed slideshow from theme (for isolating in a plugin)
Merge branch 'master' of ssh://cms/data/marketing/git/uw-2013
updated mailchimp image size
added php environment variables to javascripts realm of understanding