updated
repo structured
updated
gitignore not workging
merge resolved