ignore DS_Store
fix image markup
merge