what?
Merge branch 'master' of github.com:magania/CORE2

Conflicts:
	AAAREADME.txt