add code
add gitignore
Merge branch 'master' of github.com:douzifly/StickDariy

Conflicts:
.gitignore
project.properties
src/douzifly/android/stickdairy/data/Thing.java
a