did some stuff
Merge pull request #42 from laxrph10/about-us

did some stuff
merge conflicts