Merge remote-tracking branch 'Chris/master'
Added UserView
Merge remote-tracking branch 'Mfioravan/master'

Conflicts:
	HobbyHubWebApp/.gitignore
	HobbyHubWebApp/src/edu/ycp/cs320/hobbyhub/client/UserView.java