update
Merge branch 'master' of github.com:RubyLouvre/avalon.test

Conflicts:
	src/avalon.js
	src/avalon.modern.js