updated presentation
removed annoying Thumbs.db
fixed merge