Merge branch 'master' into gh-pages

Conflicts:
	dist/ng-chords.min.js