Merge branch 'master' of https://github.com/gregreindel/My-Genesis-Starter-Theme

Conflicts:
	readme.rtf