-fixed small syntax errors.
Merge branch 'master' of github.com:YfLn/CEN3031FA14
-View User page displays user portfolio properly again
fixing conflict