test
Merge branch 'alextest'

Conflicts:
	_site/about.html
	_site/archive.html
	_site/atom.xml
	_site/casino-gaming-conveyor-upgrade/index.html
	_site/casino-gaming-powerbuilder-upgrade/index.html
	_site/categories.html
	_site/contact.html
	_site/energy-bar-conveyor-sync/index.html
	_site/energy-bar-mixer/index.html
	_site/factorytalk-historian-and-vantagepoint-cement-company/index.html
	_site/factorytalk-historian-and-vantagepoint/index.html
	_site/gold-mine-wonderware-historian/index.html
	_site/index.html
	_site/lab-information-management-system/index.html
	_site/needs-assessment-system/index.html
	_site/pages.html
	_site/platforms.html
	_site/potato-PLC5-conversion/index.html
	_site/process-change-management-system/index.html
	_site/rss.xml
	_site/solar-109MW/index.html
	_site/solar-facility-and-monitoring-website/index.html
	_site/tags.html
	_site/wonderware-to-factorytalk-historian-conversion/index.html