Resolved HashMap/ArrayList issues
Merge branch 'master' of https://github.com/derektom14/HackRice2014

Conflicts:
	HWOrganizer/src/hwo/FilterSettings.java
Merge branch 'master' of https://github.com/derektom14/HackRice2014
Merge branch 'master' of https://github.com/derektom14/HackRice2014
Added way to delete assignments in a range (based on filter)