top added
Merge branch 'master' of https://github.com/kaxi1993/Quizzes

Conflicts:
	app.js
	package.json
	public/stylesheets/style.css
	public/stylesheets/style.styl
	routes/register.js
	routes/schemaDB/user.js
	routes/users.js
	views/admin.jade
	views/index.jade
	views/layout.jade
	views/user.jade