Commit what I've done so far
Merge branch 'master' of git://github.com/sarenji/giant-panda

Conflicts:
	index.html
	main.js
	style.css