Override toString in User
Merge https://github.com/brentAtWork/imitationTwitter

Conflicts:
	.idea/workspace.xml