Alice -- Commit before trunk merge
Merge branch 'master' of https://github.com/aliceqhuang/bb7k

Conflicts:
	monopoly.pdf
Alice -- Merge conflict resolution