Brian Talbot 20553b00d3 resolving merge conflict with master

2013-02-15 09:32:38 -05:00

..

main_settings_view.js

resolving merge conflict with master

2013-02-15 09:32:38 -05:00

settings_grading_view.js

More for that commit

2013-02-07 14:46:42 -05:00