updated steps
steps
steps
steps
 conflict resolved removed thumbs.db merged branch origin/master in master