Modify data
Merge branch 'master' of https://github.com/therobinkim/energize

Conflicts:
	main.js