Added compass
added compass
added compass
added gitignore and some sass
added gitignore and some sass
adden some fun stuff
removed conflicts