new commit
new commit
new commit
nowy komit z ts
Merge origin/master

Conflicts:
	application/views/scripts/error/404.phtml
	public/pogoda-212.txt