initial commit
merged changes
updated gitignore