initial checkin
resolved conflict of .gitignore