Fixed bug in word.py, added database testing
Added tests and merged save method to __init__
Test Commit Permissions Error
Test Commit
Merge branch 'database' of https://github.com/ncss-2014-group-3/word-by-word into database
Fixed that stupid bug in word.py that is satan
Merge branch 'database' of https://github.com/ncss-2014-group-3/word-by-word into database
Added template engine link.
Made method story_list () return a list of Story objects
linked story and word properly

Word count
story recursave delete
Merge branch 'database' of https://github.com/ncss-2014-group-3/word-by-word into database
Implemented basic tutorial for story object (DB)
added a create a story template
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word
Created __init__.py
Removed wordchild table
Merge branch 'database' of https://github.com/ncss-2014-group-3/word-by-word into database
Changed connection to one in __init__.py
delete old word validation
Merge branch 'database' of https://github.com/ncss-2014-group-3/word-by-word into database

Conflicts:
	database/story.py
	database/word.py