Resolve conflicts
Remove extraneous code
Merge pull request #8 from aellawind/AmiraBranch

Function to move tasks between headers