Made preparations for new character
Merge branch 'master' of https://github.com/creativeNameHere/Programming2

Conflicts:
	bin/Base.class
	bin/Character.class
	src/Base.java
Began working on controls for character 2
Merge branch 'master' of https://github.com/creativeNameHere/Programming2
Made second character work