Initial checkin
Merge .gitignore