fixing .column css class
.gitignore changes
merging .gitignore