initial checkin
added a space
merged conflicts on gitignore