Fixed merge conflict

Merge branch 'dev'

# Conflicts:
#	NEWS.md

Increment version number

Merge pull request pmcharrison#10 from pmcharrison/dev

Dev

Merge pull request pmcharrison#9 from pmcharrison/dev

cabat v0.8.0

Merge pull request pmcharrison#8 from pmcharrison/dev

Dev

Increment version number

Merge pull request pmcharrison#4 from pmcharrison/dev

Adding documentation, revising default ability estimation method

Merge pull request pmcharrison#3 from pmcharrison/dev

Adding French support

Merge pull request pmcharrison#2 from pmcharrison/dev

Introducing compile_trial_by_trial_results()

Merge pull request pmcharrison#2 from pmcharrison/dev

Introducing compile_trial_by_trial_results()