2014-03-20
Merge branch 'master' of github.com:nbirnel/bm

Conflicts:
	log.txt
Mon, Mar 24, 2014  9:12:36 PM