commit from terminal
Merge https://github.com/rutkat/flare

Conflicts:
	LICENSE
	README.md
	flare.jquery.js
	flare.jquery.json
	flare.jquery.min.js