Committing now before I break everything again
Merge branch 'master' of github.com:vmagro/GlassTimelapse