Changes from GitHub... not Coda... Don't understand this.
Merge branch 'master' of https://github.com/aaronpods/Portmanteau-Designs

Conflicts:
	index.php