Added basic scaffolding for GradingConflict controller.
Added basic scaffolding for GradingConflict controller.

blerner/bottlenose,CodeGrade/bottlenose,CodeGrade/bottlenose,CodeGrade/bottlenose,CodeGrade/bottlenose,blerner/bottlenose,CodeGrade/bottlenose,blerner/bottlenose,CodeGrade/bottlenose,blerner/bottlenose,blerner/bottlenose,blerner/bottlenose,blerner/bottlenose,CodeGrade/bottlenose