Test Commit
Merge branch 'database' of https://github.com/ncss-2014-group-3/word-by-word into database