Merge branch 'Ians-Branch' of http://github.com/SharpenedSpoon/wp-content

Conflicts:
	.gitignore
	plugins/foxy-editor/.DS_Store
	themes/.DS_Store
	themes/genesis-nmtheme/css/grid.css
	themes/genesis-nmtheme/css/visual_style.css
	themes/genesis-nmtheme/footer.php
	themes/genesis-nmtheme/functions.php
	themes/genesis-nmtheme/grid.scss
	themes/genesis-nmtheme/header.php
	themes/genesis-nmtheme/utils/page-options.php
	themes/genesis-nmtheme/visual_style.scss
	themes/genesis-nmtheme/xml/.DS_Store
	themes/genesis-tcb/css/IansStyles.css
	themes/genesis-tcb/css/grid.css
	themes/genesis-tcb/footer.php
	themes/genesis-tcb/functions.php
	themes/genesis-tcb/images/.svn/all-wcprops
	themes/genesis-tcb/images/.svn/entries
	themes/genesis-tcb/images/.svn/prop-base/favicon.png.svn-base
	themes/genesis-tcb/images/.svn/prop-base/post-comments.png.svn-base
	themes/genesis-tcb/images/.svn/prop-base/rss.png.svn-base
	themes/genesis-tcb/images/.svn/prop-base/twitter-nav.png.svn-base
	themes/genesis-tcb/images/.svn/text-base/favicon.png.svn-base
	themes/genesis-tcb/images/.svn/text-base/post-comments.png.svn-base
	themes/genesis-tcb/images/.svn/text-base/rss.png.svn-base
	themes/genesis-tcb/images/.svn/text-base/twitter-nav.png.svn-base
	themes/genesis-tcb/images/beer-icon.png
	themes/genesis-tcb/images/favicon.png
	themes/genesis-tcb/images/layout-home.gif
	themes/genesis-tcb/images/layout-menu.gif
	themes/genesis-tcb/images/layout-text.gif
	themes/genesis-tcb/images/post-comments.png
	themes/genesis-tcb/images/rss.png
	themes/genesis-tcb/images/twitter-nav.png
	themes/genesis-tcb/layouts/layout-beer.php
	themes/genesis-tcb/layouts/layout-home.php
	themes/genesis-tcb/page-front.php
	themes/genesis-tcb/screenshot.png
	themes/genesis-tcb/scss/IansStyles.scss
	themes/genesis-tcb/scss/grid.scss
	themes/genesis-tcb/style.css
	themes/genesis-tcb/xml/genesis.xml
	uploads/supersize/.DS_Store
Merge branch 'master' of https://github.com/SharpenedSpoon/wp-content

Conflicts:
	themes/genesis-nmtheme/css/IansStyles.css