Delete two js-files
Delete 1 function in JS-file
Change DB
Some changes
Some changes
Some changes
Merge branch 'myBranch'

Conflicts:
	public/js/script.js