we now print line and columns properly
Merge branch 'master' of https://github.com/person594/cs153

Conflicts:
	assignment2/wci/frontend/java/Tester.java
	assignment2/wci/frontend/java/Tokenizer.java