Eric waz here

Squashed commit of the following:

commit 1bfce308a2825a137434ae5838e34a5049032a06
Merge: f4460c6 fe02ea9
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Wed Apr 24 19:43:48 2013 -0400

    Merge branch 'master' into voodoo

    I am a golden god

commit f4460c6e35461a76b59beef35c495733d6e71259
Author: Franck Kamayou <franckamayou@gmaill.com>
Date:   Wed Apr 24 18:33:32 2013 -0400

    adding a candle model and a table model

commit eda4208644c4b64def421df04adb26f50676d3d9
Author: Nicholas Ver Voort <moldorma@gmail.com>
Date:   Wed Apr 24 18:10:59 2013 -0400

    Made default particle functions be white and up
Boats and hoes