major changes to user.php, putting in index.php format.4
Merge branch 'master' of https://github.com/martianmartin/myStream