Checking git commits
Merge branch 'master' of https://github.com/SEresearch/aqua

Conflicts:
	src/errors/syntax/semic/PackageError.java