Merge pull request #36 from mplaza/melabranch

Melabranch
Merge pull request #37 from mplaza/melabranch

adding about page
resolved merge conflicts
Merge pull request #38 from mplaza/paulbranch

resolved merge conflicts