Changed FileReader exception to FileNotFoundException per Julian's request
CourseReader depends on Course class which isn't up yet.
Merge origin/master