Now ignoring NPM modules in .gitignore
Now using parent directory's CSS files for consistency
Merged (oops)