initial check in
added a space
Merged conflicts on gitignore