try a ne wcommit
test test test
Merge remote-tracking branch 'upstream/master' into new
Merge branch 'master' of https://github.com/githubteacher/tcube-jan2014 into new
hey there
Merge pull request #12 from paulhitz/master

ghjghjghjgh