Update Gitignore
Fix merge conflict commit from Jun 05th
Fix merge conflict commit from Jun 06th
Fix merge conflict commit from Jun 16th
Fix merge conflict commit from Jun 17th
Fix merge conflict commit from Jun 18th
remove gui elements