Merge branch 'master' of C:\Users\Jeff\Documents\Move4klant with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/jeff/move4klant/EditUserInfoActivity.java
service 0.9 commit
service 1.0  commit