Limit number of places that can be extracted from a sentence, to prevent infinite loops.
Revised the query reader to accept an input stream.
Removed Java 7 features to make our project compatible with Amazon Elastic MapReduce.
Fixed NullPointerException bug.
Removed headers from 2009 annotations.
Added a Hadoop job to group sentence annotations together.
Started work on some other MapReduce jobs.
Ignored more stuff.
Merge branch 'master' of github:solowandererY2K/cse454-location

Conflicts:
	src/sf/filler/tree/BaseTregexFiller.java