Custom patt
Merge branch 'master' of https://github.com/Hagbarth/andarfun

Conflicts:
	andarfun/src/main/java/dk/au/cs/ubi/andarfun/CustomActivity.java