WP 3.5 with theme skeleton based on _s
Merge branch 'master' of github.com:citrusmist/wpzest

Conflicts:
	.gitignore