herp
Merge branch 'master' of https://github.com/macarr/cse3481.git

Conflicts:
	Activity1/bin/util/ByteWorks.class
Merge branch 'master' of https://github.com/macarr/cse3481.git