data science updated
Merge branch 'v2' of https://github.com/dreamyourweb/orikami into v2

Conflicts:
	client/views/home/delau.jade