Changes before makes pull
Merge branch 'master' of https://github.com/alfabrad/minvielle_photography
codekit file
Merge branch 'master' of https://github.com/alfabrad/minvielle_photography

Conflicts:
	config.codekit