Local changes.
More various things
Commit
Changes
This thing
Thing2
Merge branch 'master'

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
	hw3/IR.java