.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/malign.scala
Added full fledged alignment() method to IBMAMRAligner.