changes code
Merge branch 'dev' of github.com:Espier/iAndroid_ios7_voicememos into dev
add .DS_Store to ignore list
Merge branch 'dev' of github.com:Espier/iAndroid_ios7_voicememos into dev