Initial commit.
Merge branch 'master' of github.com:dwyang/cbp2014
Set up OK.
Update .gitignore.