foo
commit a1
commit a2
Merge branch 'refs/heads/master' into testing-a
Merge pull request #2 from joshuajabbour/testing-a

merge to master
Merge branch 'master' into testing-c

Conflicts:
	bin/draw-ruler