João Batista 7f253fcb0e Merge branch 'master' of https://github.com/FranciscoPinto/cern-summer-webfest ... Conflicts: js/javascript.js		2012-08-05 12:04:05 +02:00
..
jquery.bxSlider	Starfield + nav	2012-08-04 20:58:10 +02:00
javascript.js	Merge branch 'master' of https://github.com/FranciscoPinto/cern-summer-webfest	2012-08-05 12:04:05 +02:00
javascriptjs	Folder structure WIP	2012-08-04 15:24:29 +02:00
slider.js	Loads the slides (ugly still)	2012-08-05 12:00:11 +02:00