a
Merge branch 'master' of https://github.com/axelhildingson/groupName1

Conflicts:
	res/layout/fragment_have_virus.xml