Initial push from private to public
Fixed conflict in gitignore