Removed the unused public directory + added author partial
Fixed conflict in .gitignore file