initial checkin
merged .gitignore