work
fixed conflicts
Merge branch 'error' of github.com:Buzz2Buzz/Timelapse into error
error with posting