added commit to fetch users
Merge branch 'master' of github.com:saulmm/makeTheBedAdmin

Conflicts:
	src/main/java/saulmm/yagoc/makeTheBedAdmin/gui/MainActivity.java