First Commit
fixed merge problem with .gitignore