initial commit
added readme and package.json
added more to readme and gitignore. added npmignore
resolved conflicts in .gitignore