Avoiding conflicts
Merge remote-tracking branch 'upstream/master'
Order display changes
Order display changes: print action; complete action
Merge pull request #11 from Axelena/master

Order display changes