index on master: 5ffd562 amend Rakefile,Makefile for setting to show git branch
WIP on master: 5ffd562 amend Rakefile,Makefile for setting to show git branch
Merge commit 'stash'