Merge branch 'redesign_v4.0' of https://github.com/firebrandmedia/inthepanhandle into redesign_v4.0

Conflicts:
	README.md
Fixed conflict
Conflict Fix