working 50%.
merged the branch gauravbranch to master.
Merge remote-tracking branch 'origin/gaurav_ftoc'

Conflicts:
	hw2/src/hw2/association.java
Merge pull request #2 from parapsyche/master

merge