merging
Merge branch 'master' of https://github.com/rochesterCSC210/lindyfiles
Merge branch 'master' of https://github.com/rochesterCSC210/lindyfiles
Merge branch 'master' of https://github.com/rochesterCSC210/lindyfiles
Stable version with cookie test