Update to packpage json to bring inline with new version of npm, small change to scss file
Resolving a conflict and added css to git ignore