Added startup code
Fixed .gitignore conflict