csv, and other things
Merge branch 'master' of https://github.com/andrewhood125/ConsequenceStudy

Conflicts:
	View.java