Making things pretty/organized
Merge pull request #4 from mateoclarke/mateo

Making things pretty/organized