Initial commit
resolved merge conflict
added docs
added .gitignore