BRANCH = NEW BRACH^2
int i = i++;
Merged merged merged
Merge branch 'krisArt'

Conflicts:
	src/Artor.java