working on images and stuff
fixing sync errors
Merge remote-tracking branch 'origin/master'