Updated file layout github and bootstrap
Merge branch 'master' of https://github.com/RichardBray/muffin

Conflicts:
	CHANGELOG.md