Merge branch 'master' of github.com:stevo/highcharts_on_rails

Conflicts:
	.gitignore
	README.md
Merge branch 'master' of github.com:stevo/highcharts_on_rails

Conflicts:
	.gitignore
	README.md