Merge branch 'master' into development
working on a new post layout
Working on article
Updating author snippet
Adding project content type
working on an article
Polishing content
Universal Tracking Code
Merge branch 'development'

Conflicts:
	_config.yml
	_site/about/index.html
	_site/blog/2014-new-year/index.html
	_site/blog/code/cache-busting-css-js/index.html
	_site/blog/code/clean-your-drupal-html-output/index.html
	_site/blog/code/nice-pie-charts-css3/index.html
	_site/blog/code/nifty-jquery-snippet/index.html
	_site/blog/code/place-elements-circle-css/index.html
	_site/blog/code/responsive-grammar-worth-it/index.html
	_site/blog/code/stacked-bar-graphs/index.html
	_site/blog/hou-op-n-wees/index.html
	_site/blog/index.html
	_site/blog/keep-it-simple-stupid/index.html
	_site/blog/madiba-1918-2013/index.html
	_site/blog/milestone-moved-cape-town/index.html
	_site/blog/superbunny/index.html
	_site/blog/thought/loerie-awards/index.html
	_site/blog/working-holiday/index.html
	_site/contact/index.html
	_site/index.html
	_site/portfolio/index.html
	_site/portfolio/website/aspen-e-solutions/index.html
	_site/portfolio/website/kia-fusion/index.html
	_site/portfolio/website/my-wedding/index.html
	_site/portfolio/website/qtique/index.html
	_site/portfolio/website/qtm-admin-interface/index.html
	_site/project/index.html
	_site/sitemap.xml
	portfolio/index.html
update config
generate site
Merge branch 'development'

Conflicts:
	_config.yml
	_site/about/index.html
	_site/blog/2014-new-year/index.html
	_site/blog/code/cache-busting-css-js/index.html
	_site/blog/code/clean-your-drupal-html-output/index.html
	_site/blog/code/nice-pie-charts-css3/index.html
	_site/blog/code/nifty-jquery-snippet/index.html
	_site/blog/code/place-elements-circle-css/index.html
	_site/blog/code/responsive-grammar-worth-it/index.html
	_site/blog/code/stacked-bar-graphs/index.html
	_site/blog/hou-op-n-wees/index.html
	_site/blog/index.html
	_site/blog/keep-it-simple-stupid/index.html
	_site/blog/madiba-1918-2013/index.html
	_site/blog/milestone-moved-cape-town/index.html
	_site/blog/superbunny/index.html
	_site/blog/thought/loerie-awards/index.html
	_site/blog/working-holiday/index.html
	_site/contact/index.html
	_site/index.html
	_site/portfolio/index.html
	_site/portfolio/website/aspen-e-solutions/index.html
	_site/portfolio/website/kia-fusion/index.html
	_site/portfolio/website/my-wedding/index.html
	_site/portfolio/website/qtique/index.html
	_site/portfolio/website/qtm-admin-interface/index.html
	_site/project/index.html
	_site/sitemap.xml
	portfolio/index.html
fixed weirdness