Merge pull request #24 from JeremyKooper/master

Fixed the triangles so they connect again
fixing a folder naming issue
made some sick programmer art menus
Merge pull request #25 from wroy/master

made some sick programmer art menus
Fixed the physics again