resolving issues and adding ignore
Merge branch 'master' of https://github.com/smiles/codeninja