Created __init__.py
Changed connection to one in __init__.py
Merge branch 'database' of https://github.com/ncss-2014-group-3/word-by-word into database

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