Merge branch 'master' into Jeanne
File re-organized, grading sheet added
Merge branch 'Jeanne'