removed old file
Merge branch 'master' of https://github.com/acgrissom/MapReduce-assignments

Conflicts:
	assignment2/src/main/PairsPMI.java~
old
Merge branch 'master' of https://github.com/acgrissom/MapReduce-assignments
assignment files, images, etc.
Merge branch 'master' of https://github.com/acgrissom/MapReduce-assignments
Got a message saying that this branch was behind.