Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Add caching support
remove message about files
Added readme
Change which options are on or off by default
Grader stuff
Options update