Updated gitignore
Merge branch 'master' of https://github.com/citizensense/csk
Sorted git ignore