Figured out how to display user info on webpage and removed more unnecessary stuff.
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/accountInfo/accountInfo.html
	client/app/main/main.html
Figured out how to display user info on webpage and removed more unnecessary stuff.
Figured out how to display user info on webpage and removed more unnecessary stuff.