Removed frequency
Updated methods and variables
Minor changes
Merge branch 'master' of https://github.com/derektom14/HackRice2014

Conflicts:
	HWOrganizer/src/hwo/AAssignment.java
	HWOrganizer/src/hwo/SingleAssignment.java
Try