Merge branch 'blog-feed-shortcode'
Adding radioshack ads to weekend projects hangouts page
Removing the custom-feed short code in favor of using page templates (as per VIP).
Merge branch 'blog-feed-shortcode'
Removing some more stuff from the custom-feed short code
Updating slideshow photos
Updating the landing page to utilize the_content()
Merge branch 'master' into develop

Conflicts:
	includes/shortcodes.php
	includes/theme_stuff.php