popped userinfo.php messed up when go from userFeed.php
fixed userInfo page issues
reverted to previous userInfo.php
Merge remote-tracking branch 'remotes/origin/popUserPage'

Conflicts:
	conDB.php