only the staged files i hope, others had conflicts
Merge pull request #28 from kyledaugherty/zac-saturday-am

only the staged files i hope, others had conflicts