git init
Merge branch 'drkyro' into thedigit
 some ui stuff
Merge branch 'thedigit' into drkyro