add php ide
add markdown basics
fix bugs
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/core-samples/2011-12-29-jekyll-introduction.md.bak