To ni važno

Nisem mogla odpreti, če nisem syncala svojih zadev. Ignore :)
Merge branch 'master' of https://github.com/wesny11/NihonByTheWay

Conflicts:
	header.php
	login.php
	register.php