Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from codecombat/master

Merge with codeCombat
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from codecombat/master

update
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from codecombat/master

Update
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from codecombat/master

update
Merge branch 'master' of https://github.com/Darredevil/codecombat
Added joke tip
Merge branch 'master' of https://github.com/Darredevil/codecombat
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/templates/play/level/level_loading.jade
Merge branch 'master' of https://github.com/codecombat/codecombat into codecombat-master
Merge branch 'codecombat-master'
new Documentation page
Merge branch 'master' of git://github.com/Darredevil/codecombat into Darredevil-master
Some slight improvements to the components docs page; still don't know how to get it to be full-height with independently scrolling columsn, though.
Merge branch 'Darredevil-master'
Merge branch 'master' of https://github.com/codecombat/codecombat