Add data
Update all code
Merge branch 'vij'

Conflicts:
	.DS_Store
	Data/.DS_Store
Not sure what I'm doing here