Ignore .cache
Ignore .cache, getting the merge done as well
Getting things in sync
Merge branch 'master' of https://github.com/frizop/stposh