stuff
bobMerge branch 'master' of https://github.com/oliverwkim/cs51-project

Conflicts:
	CS51Project/bin/DStarLite.class
blah
blahMerge branch 'master' of https://github.com/oliverwkim/cs51-project

Conflicts:
	CS51Project/bin/DStarLite.class
	CS51Project/src/DStarLite.java
added character position