aron 2
Ian's Commit TaskMgt
Project Class
Ian's Commit 123
aron's 123
Hey Ian!
Aron merged both branches

Conflicts:
	build/classes/taskmgt/Data.class
	build/classes/taskmgt/Models/Administrator.class
	build/classes/taskmgt/Models/Project.class
	build/classes/taskmgt/Models/Task.class
	build/classes/taskmgt/Models/User.class
	src/taskmgt/Data.java
	src/taskmgt/Models/Administrator.java
	src/taskmgt/Models/Project.java
	src/taskmgt/Models/User.java
aron 3