a
a
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/aslon_scaffold/version.rb