add gitignore and internal files
Get changes from master