Merge branch 'master' of https://github.com/jdfdesign/gko_letoiny_com

Conflicts:
	Gemfile
	Gemfile.lock