Merge pull request #10 from JoeStaines/master

fixed array
Update user.php
Update testpage.php
Merge remote-tracking branch 'upstream/master'