started implementing picker view for timer and made picker view for settings disappear when clicked
Merge branch 'master' of https://github.com/eyli/cs195i-snapchat-redesign
merged
erge
keyboard hides correctly when you hit return
Merge branch 'master' of https://github.com/eyli/cs195i-snapchat-redesign
merge