Merge branch 'master' of https://github.com/ClemMakesApps/Nonzi

Conflicts:
	client/app/app.scss
	client/index.html
Add modal.scss
Ignore npm-debug.log