Server-side changes - ignoring pyc and swp files
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