dodajanje kvizov - testna verzija
Merge branch 'master' of https://github.com/snooze77/android.git

Conflicts:
	AndroidManifest.xml
	gen/com/mbajk/R.java
	res/values/strings.xml
	src/com/mbajk/MainActivity.java
Skoraj končna verzija brez designa
Merge branch 'master' of https://github.com/snooze77/android.git

Conflicts:
	gen/com/mbajk/R.java
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/mbajk/MainActivity.java