First pages commit
Merge branch 'gh-pages' of git://github.com/wanyizhu/beeproject2013 into gh-pages

Conflicts:
	index.html
	params.json