Updates updates updates ;-)
Updates updates updates ;-)
Updates updates updates ;-)
Updates updates updates ;-)
Updates updates updates ;-)
Updates updates updates ;-)
from testmerge
Updates updates updates ;-)
Updates updates updates ;-)
Updates updates updates ;-)
Updates updates updates ;-)
Update rbefdata.Rmd

Small changes in Abstract and Discussion
Updates updates updates ;-)
Merge branch 'master' of github.com:cpfaff/rbefdata_paper

Conflicts resoved:
	paper/rbefdata.Rmd
Updates updates updates ;-)
Updates updates updates ;-)
Updates updates updates ;-)
Updates updates updates ;-)
Merge branch 'author_aclang' of github.com:cpfaff/rbefdata_paper into author_aclang

Conflicts:
	paper/rbefdata.Rmd
Updates updates updates ;-)