Loads of style changes
Added npm
Merge branch 'master' of https://github.com/JamesLefrere/rinkydinklink

Conflicts:
	client/sass/config/_base.scss
	client/sass/config/_extendables.scss
	client/sass/config/_variables.scss
	client/sass/global/_global.scss
	client/sass/global/_layout.scss
	client/sass/modules/_comments.scss
	client/sass/modules/_links.scss
	client/sass/modules/_login.scss
	client/sass/style.scss
	client/stylesheets/style.css