Committing before updating. I forgot so I'm probably going to deal with
conflicts... GREAT!
Merge branch 'master' of https://github.com/srbdev/db-project.git

Conflicts:
	dbproject/src/main/webapp/resources/js/miningHelper.js