resolve pull issues
Merge branch 'master' of https://github.com/jessicazuniga/kiki
fix merge conflict
going indicator