Alice -- removed .o files
Merge branch 'master' of https://github.com/aliceqhuang/bb7k

Conflicts:
	original/bb7k.pdf
Alice -- Manual merge conflict resolution