siggi first
Merge branch 'master' of ssh://git@github.com/aronskulason/2know.git

Conflicts:
	2know/src/is/appia/toknow/MainActivity.java
báðir