Codekit
Merge branch 'Static-Site' of https://github.com/WashDesign/Wash-Site into Static-Site

Conflicts:
	codekit-config.json