BlogEngine.suo commited.
Merge branch 'master' of https://github.com/aoleynikov/HeatTransferSystems

Conflicts:
	BlogEngine/BlogEngine.suo
Merge branch 'master' of https://github.com/aoleynikov/HeatTransferSystems
ContactUs.js was updated to set Fax field on the ContactUs page optional.
Merge branch 'master' of https://github.com/aoleynikov/HeatTransferSystems

Conflicts:
	BlogEngine/BlogEngine.NET/App_Data/logger.txt