idea
Merge branch 'master' of https://github.com/ronlanger/mustache

Conflicts:
	.idea/workspace.xml