MainFrame changes
Merge branch 'master' of https://github.com/spockNinja/GhostGrader into CourseStatistics
Merge branch 'master' of https://github.com/spockNinja/GhostGrader into CourseStatistics
Merge branch 'master' of https://github.com/spockNinja/GhostGrader into CourseStatistics
Merge branch 'master' of https://github.com/spockNinja/GhostGrader into CourseStatistics
Changed data structure in objects that represent the grades to ints instead of doubles.
changed TestHelper.java to reflect change from doubles to ints
Merge branch 'master' of https://github.com/spockNinja/GhostGrader into intsToDoubles

Conflicts:
	src/objects/Assignment.java
Removed strange merge tags...
Removed more merge tags
Merge branch 'master' of https://github.com/spockNinja/GhostGrader into intsToDoubles

Conflicts:
	src/interfaces/MainFrame.java
	src/interfaces/editClass/EditSelectedClass.java
Disallow null values to be returned for getGrade in Assignment.java
Fixed getGrade() 0.0 to 0
Merge pull request #58 from tarah/intsToDoubles

everything seems good. proper changes in the correct places.