initial commit
updated git ignore(merged play default with git's one)
resolved merging issue