Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Merge branch 'devel'
Edited cat messages and added an R file to make changes to later
Merge branch 'master' into devel