data2 changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
modified data2.jade
modified data2.jade
Merge remote-tracking branch 'origin/master'