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

Conflicts:
	UIHarkka/build/classes/com/example/uiharkka/Kurssi.class