aa
try mvn1
Merge branch 'master' of https://github.com/1169306/project-team06

Conflicts:
	project-team06/src/main/resources/Descriptors/aeDescriptor.xml