Initial Commit
uploading code...
adding .gitignore
resolving conflicts...