gitignore 변경.
충돌 고침.
Merge branch 'master' of https://github.com/skimms/android
gitignore 수정.
Merge branch 'master' of https://github.com/skimms/android
apiDemos 등록