initial commit
Fixed Merge branch 'master' of https://github.com/housekeeper/locomotivecms_liquid_extensions

Conflicts:
	.gitignore