test comment
test merge
Merge branch 'master' of https://github.com/adi10ain/MAMN01.git

Conflicts:
	aProfile/bin/classes/com/LTH/aprofile/MainActivity.class
	aProfile/src/com/LTH/aprofile/MainActivity.java