Edited gitignore and some css
Merging
Editing CSS for base and example