kurtk84@kurtk84-System-Product-Name:~/artwork$ git log
commit d48abd69db7bf647ae8184f2b73e8eb741732822
Merge: 71049fe e568d11
Author: Kurtis Kesler <kurtk8484@gmail.com>
Date:   Sun Jul 26 19:40:13 2015 -0500

    Merge branch 'master' of ssh://octaforge.org:33000/chaos/artwork

commit e568d115f59abbaba949f752135804d088ca7c89
Author: t0mh <tomh789@gmail.com>
Date:   Sun Jul 26 13:28:49 2015 -0400

    Updated diffuse

commit c32557087678d2dd9ac0a3c5ab92a0456c9a84ff
Author: Kurtis Kesler <kurtk8484@gmail.com>
Date:   Sat Jul 25 19:47:38 2015 -0500
commit c32557087678d2dd9ac0a3c5ab92a0456c9a84ff
Author: Kurtis Kesler <kurtk8484@gmail.com>
Date:   Sat Jul 25 19:47:38 2015 -0500

    rock model updates, map updates, new wood texture

commit 972da6aca3384712fdef813c47acdf3d123a6194
Author: t0mh <tomh789@gmail.com>
Date:   Sat Jul 25 19:22:44 2015 -0400

    Updated crate UVs

commit 29da38065f4f2923d9847b0d436df091cc4b0ec7
Author: q66 <daniel@octaforge.org>
Date:   Sat Jul 25 21:12:36 2015 +0100

    fixed collide obj for lift

commit ded0dfeabccc0af30da0845934cd2e16d91495ac
Author: t0mh <tomh789@gmail.com>
Date:   Sat Jul 25 15:51:54 2015 -0400

    Lift model

commit 67ecedc341d7accb8960615b736a9a529a519599
Author: t0mh <tomh789@gmail.com>
Date:   Sat Jul 25 15:29:46 2015 -0400
:
    Crate updates

commit 113863c04edce96aa58a007438310c8bce2a51bc
Author: q66 <daniel@octaforge.org>
Date:   Sat Jul 25 20:25:29 2015 +0100

    tweaked leaf color

commit fef84425878c6b8179452af8d9b123f2469701d3
Author: Kurtis Kesler <kurtk8484@gmail.com>
Date:   Sat Jul 25 14:08:50 2015 -0500

    tree01 leaves updated

commit ccd8bab62aa3860d475cd469fd7e9b93e0e2d772
Author: t0mh <tomh789@gmail.com>
Date:   Sat Jul 25 13:00:35 2015 -0400

    A wooden crate

commit 27cb32275508c79200f93443334a5bf6477eab2f
Author: t0mh <tomh789@gmail.com>
:
Date:   Sat Jul 25 12:50:53 2015 -0400

    Higher poly rocks and associated cfg files

commit 6800498a45e63d9938d5b836c12933b0063a46f4
Author: t0mh <tomh789@gmail.com>
Date:   Sat Jul 25 12:49:13 2015 -0400

    Removed lowpoly rocks and associated cfg

commit c79ae35aead8c2726470406d434ec25953ff7653
Author: q66 <daniel@octaforge.org>
Date:   Sat Jul 25 17:19:21 2015 +0100

    fixed rockscan whitespace

commit d5ba3c9c8bb1cd628a281ae6786b790ce2eb8bfa
Author: t0mh <tomh789@gmail.com>
Date:   Sat Jul 25 12:11:34 2015 -0400

    Two scanned rocks

commit 403149194694a375815a1cd96f168a88fbceb1c3




: