solved
Merge branch 'master' of github.com:peeyer/finest

Conflicts:
	finest/reneza.cs