update
Merge branch 'master' of https://github.com/CedricGeerinckx/kaunasMarket

Conflicts:
	.sass-cache/af39b7aacd41b6335c01e613d99e432cca284532/_home.scssc
	.sass-cache/af39b7aacd41b6335c01e613d99e432cca284532/_navigation.scssc
	.sass-cache/af39b7aacd41b6335c01e613d99e432cca284532/main.scssc
	css/main.css
Merge branch 'master' of https://github.com/CedricGeerinckx/kaunasMarket

Conflicts:
	.sass-cache/af39b7aacd41b6335c01e613d99e432cca284532/_gallery.scssc
	.sass-cache/af39b7aacd41b6335c01e613d99e432cca284532/_history.scssc
	.sass-cache/af39b7aacd41b6335c01e613d99e432cca284532/_home.scssc
	.sass-cache/af39b7aacd41b6335c01e613d99e432cca284532/_map.scssc
	.sass-cache/af39b7aacd41b6335c01e613d99e432cca284532/_navigation.scssc
	.sass-cache/af39b7aacd41b6335c01e613d99e432cca284532/main.scssc
	css/main.css
info page added