Javi Velasco d008bf47f3 Merge and solve conflicts		2015-07-21 22:29:09 +02:00
..
index.cjsx	Finish slider jsx and add ids to style subNodes in progress bar	2015-07-21 22:17:39 +02:00
style.styl	Merge and solve conflicts	2015-07-21 22:29:09 +02:00