Merge pull request #1 from igasi/master

Content, Colorbox and Refactoring
mas css
Merge branch 'master' of github.com:moneda/maripace.github.io
css -----
Merge pull request #2 from igasi/master

added form
solved confict
Merge pull request #5 from moneda/master

styles