Merge pull request #1 from brown-bats-2014/development

Test push