Updated gitignore
Starting ICAP code (#3)
Merge conflict resolved