updated README and gitIgnore
removed sass cache from git ignore
fixed merge conflict