PUSHED!!!!!!!!
Oh my god - it did it!!!!!!!
Finished the interaction form.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hw5/InteractionForm.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hw5/InteractionForm.java