:boom: Converting to Jekyll project.
Merging branch.
Resolving merge conflicts.
Merge branch 'gh-pages' of https://github.com/fourkitchens/wp-prototype into gh-pages

Conflicts:
	index.html