sprates
Merge branch 'master' of https://github.com/creativeNameHere/Programming2

Conflicts:
	bin/Base.class