Merge remote-tracking branch 'upstream/master'
load data from json file to chart
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/users/show.html.erb
Merge pull request #144 from trangnt57/master

load data from json to chart