Konflikt
Merge branch 'master' of github.com:milosradovanovic/milostest

Conflicts:
	mika.java
	pera.java~