Merge of origin and master branch

Someone probably used git push master origin, thus creating a branch origin. Merging the two since there is no need for the two branches.