Merge branch 'master' into melabranch
moving file
Merge branch 'master' into melabranch
merging
Merge pull request #35 from mplaza/paulbranch

commit before merge with melabranch
user view and saved post access
merging
Merge pull request #36 from mplaza/melabranch

Melabranch
adding about page
Merge pull request #37 from mplaza/melabranch

adding about page
resolved merge conflicts