hello
Merge pull request #1 from opope12/gh-pages

BEtta
Merge pull request #2 from opope12/master

gitting stuff