Commit
Commit
Commit
Merge branch 'master' of https://github.com/zchen27/ArtProject

Conflicts:
	src/Core.java
	src/Register.java
Commit