User.java update

Added variables to user.java and gave void function variables to pull
from.
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/src/main/java/com/xlythe/textmanager/User.java