My branch commit
My branch commit
Merge branch 'myrebasebranch' of github.com:caspertradeshift/plaground into myrebasebranch

Conflicts:
	stuff.scala
Test
Master
Merge branch 'master' of github.com:caspertradeshift/plaground

Conflicts:
	stuff.scala