Nicole volunteers for merge conflicts
Merge pull request #21 from fox-squirrels-2013/nicole-volunteers-for--merge-conflicts-on-wednesday

Nicole volunteers for merge conflicts