Merge pull request #2 from brtaylor92/hw2

Merge hw2.
Merge pull request #3 from brtaylor92/hw2

Fixed main page with links, updated tests
Merge pull request #4 from brtaylor92/master

Hw 2