Merge branch 'master' of https://github.com/giannisf19/site-tester

Conflicts:
	db/db.json
	lib/parser.js
	public/js/viewModel.js
	public/js/viewModel.js.map
	public/js/viewModel.ts
	server.js