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

Conflicts:
	css/main.css
	index.php
	js/main.js