initial commit
resolved merge of .gitignore