Changed some stuff in branch dev
Added a line in master branch
Merge branch 'dev' into 'master'