Initial checkin
Resolved gitignore conflicts