first commit
shawns changes
first_commit
Merge pull request #3 from Lyonsclay/kleins

shawns changes
Merge pull request #4 from Lyonsclay/connors_first_change

I made a change to the controller.
updated changes
Merge pull request #2 from Lyonsclay/nathan

first commit
resolved conflict with nathan