cleaned up code
fixed merge conflicts
Merge pull request #4 from LaunchPadLab/homepage_edits

Homepage edits
no updates
attempting to resolve merge conflicts