take2
Merge branch 'master' of github.com:johnnyg12791/cs224n

Conflicts:
	pa1/java/classes/cs224n/wordaligner/IBMModel1.class
	pa1/java/classes/cs224n/wordaligner/IBMModel2.class
	pa1/java/src/cs224n/wordaligner/IBMModel1.java
	pa1/java/src/cs224n/wordaligner/IBMModel2.java