sdfas
k
k
l
k
k
klj
Merge branch 'master' of https://github.com/Lipxam/Ifloop2

Conflicts:
	img/kettle_1.png
	img/laser_1.png
	img/laserin_1.png
	img/laserout_1.png
	img/light_1.png
	img/lightbulb_1.png
	img/looper_1.png
	img/looper_2.png
	img/mirror_1.png
	img/solarpanel_1.png
	img/steam_1.png
	img/steamreciever_1.png
	img/water_1.png
	img/wind_1.png
	img/wire_1.png