Pushed a lot of shit
Merge branch 'master' of https://github.com/blaisebaileyfinnegan/haiku-markov

Conflicts:
	src/edu/uci/arcastro/Generators/HaikuGenerator.java
	src/edu/uci/arcastro/Generators/NaiveGenerator.java
	src/edu/uci/arcastro/Generators/UsingPatterns.java
	src/edu/uci/arcastro/Main.java
	src/edu/uci/arcastro/Predicates/ConstrainedAssociations.java