commit2
Merge pull request #1 from aleaabrams/master

Homework..... Done!