commit before pull
Merge branch 'master' of https://github.com/weichsem/Budgetbase
prevent_conflict
Merge branch 'master' of https://github.com/weichsem/Budgetbase

Conflicts:
	src/reference.js
	test/update_tests.js
adding_updated_code