Initial styles, fixing merge conflict in gitignore