test git comment
Merge remote-tracking branch 'origin/master'

Conflicts:
	aProfile/src/com/LTH/aprofile/MainActivity.java