Alice -- Preparing for merge
Merge branch 'master' of https://github.com/aliceqhuang/bb7k

Conflicts:
	academicbuilding.h