Mark Otto a98d2cccb8 merge in master, resolve conflicts		2011-08-21 20:47:24 -07:00
..
css	merge in master, resolve conflicts	2011-08-21 20:47:24 -07:00
img	adding more details on browser support, adding snippet of about text, changed p tags to have half the bottom margin	2011-08-20 01:51:06 -07:00
js	merge in master, resolve conflicts	2011-08-21 20:47:24 -07:00