updated gitignore
updated for kik assets
Merge pull request #1 from zwigby/project-merge

Project merge