work on saving text
Merge branch 'master' of https://github.com/simonweiser/SwalUserStudy

Conflicts:
	src/com/example/swaluserstudy/MainActivity.java