apk ignore
Merge branch 'master' of https://github.com/jonasberglund/skrubb_DAT255

Conflicts:
	H-sektionen/bin/H-sektionen.apk
	H-sektionen/bin/resources.ap_