fixed origin/master branch conflicts that occured after --amend commit
fixed origin/master branch conflicts that occured after --amend commit

mzijlstra/web-raptor,mzijlstra/flowcharts,mzijlstra/flowcharts,mzijlstra/web-raptor