first commit
Merge git://github.com/Michael2011/braveheart