initial commit
added readme to .gitignore
resolved merge conflict