Fixing conflicts
Merge branch 'master' of https://github.com/derektom14/HackRice2014

Conflicts:
	HWOrganizer/src/hwo/FileBrowser.java
	HWOrganizer/src/hwo/MultiFileBrowser.java