COmmit 1 on topic 3
Merge branch 'topic3' of github.com:calvinwiebe/git-test

Conflicts:
	test.coffee