update verstka
update verstka
Merge branch 'master' of https://github.com/KonstOrVar/sportfood
Update Verstka
Merge branch 'verstka'

Conflicts:
	Gemfile
update verstka