RGirish/branchtest

Just getting to know merge conflicts and understanding how to resolve them! :)