Ignore my tmpdir
Merge branch 'master' of github.com:PerfectlyNormal/highcharts-rails

Conflicts:
	.gitignore