2.7 to 3.0
Merge branch 'master' of https://github.com/Miyayx/movie-ontology

Conflicts:
	db.py
	linking.py
db
link
python3.3.5