.366 AER woooo\!\!\!
Merge branch 'master' of https://github.com/rigeljs/aligner

Conflicts:
	aligner/alignImproved