val changes
Merge branch 'master' of https://github.com/vkutsch/DRA.git

Conflicts:
	DRA/src/com/example/dra/Home.java