Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word into minor-changes
Fix for space-separated classes.

Fixed in another branch, but for the sake of the PR.
Merge pull request #44 from nhardy/minor-changes

Minor changes
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word into voting-changes