Merge pull request #2 from brown-bats-2014/staging

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

Staging
js
jss