Merge branch 'master' of hongabar.org:robotgame

resources/graphics/TODO.txt

@@ -11,10 +11,9 @@ DONE	/door/			gate
 				widen block03.png
 dummy	spacecraft.png		spaceship
 				elevating_platform
-<<<<<<< HEAD
 dummy	wall.png		walls (in-door)
 				teleportation effect (Tænker evt. at det bare skal være en cirkel på jorden, der lyser op.)
 				water/lava/to be discussed
-=======
+
                             tiles for level 1, matte and shining (green light)
->>>>>>> debca3bab2cc711d7acdfe349ad41a2810b5d165
+