correcting incorrect merges
fixing merge
del old project
Adding new project.
.ignore for security purpouses