Lapse edits pre-presentation
Merge branch 'master' of github.com:chengannie/Lapse