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