Initial commit
Uploading mini maker faire theme files
Merge branch 'master' of https://github.com/billolson/mini-maker-faire-wp
Merge branch 'master' of https://github.com/Make-Magazine/minimakerfaire-original

Conflicts:
	README.md