Added checking to file load
Merge branch 'master' of https://github.com/scottessner/timelapse.git