test
Completed teddit homework
Merge pull request #15 from eyeman/master

Aimen