start

Signed-off-by: zwerek1990 <zwerek1990@gmail.com>
Merge branch 'master' of https://github.com/zwerek1990/trikotag

Conflicts:
	inside-out.php
	js/gallery.js
	js/js.js
	js/map.js
	map.php
	new.php
	news.php
	pants.php
	request.php
	sale30.php
	school.php
	sent_partnership.php
	style/style.css
	vesna2013.php

Signed-off-by: zwerek1990 <zwerek1990@gmail.com>