added Chisel
Fixed conflicts and site uptodate as of 4/11/13

Conflicts:
	index.php