main styling is in progress, this is the test
fixing carlos/collin merge conflicts
Merge pull request #17 from rpazyaquian/merging_collin_carlos

Merging collin carlos