Reconciling between laptop & remote repo

Merge branch 'master' of https://github.com/rserur/Serur-Project-2