added from_file loading
added from_file loading
Merge remote-tracking branch 'origin/template-engine'
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word