update
Merge branch 'master' of github.com:zhoui/records

Conflicts:
	js/data.js