Changes master branch

Could this result in a conflict?
Conflict Dev side
Revert "Changes master branch"

This reverts commit be0ea3dc2441b8ef2521e72ca3ca47f9b0066986.

Conflicts:
	work.txt