asdf
Merge branch 'master' of https://github.com/jusjoo/UIHarkka.git

Conflicts:
	UIHarkka/build/classes/com/example/uiharkka/AllData.class
	UIHarkka/build/classes/com/example/uiharkka/Opiskelija.class
	UIHarkka/build/classes/com/example/uiharkka/UiharkkaUI$1.class
	UIHarkka/build/classes/com/example/uiharkka/UiharkkaUI.class