Starting novela feature
Merge branch 'stage' into novelas
Novela tree now working
Matrix working now
Analysis files added
Fixed a bug
Merge branch 'novelas' into stage

Conflicts:
	cc_mining/templates/index.html
	cc_mining/views.py