took care of merge conflicts
Merge pull request #9 from brown-bats-2014/merge_marks_jayme

took care of merge conflicts