first commit to derp over
Merge branch 'master' of https://github.com/CruzLabs/Cruz-Labs-website