Add tools dir
Allow compiling of assets into binary
Resolved conflicts