Ya podés perder
Merge branch 'master' of https://github.com/lepocamon/game-off-2013

Conflicts:
	app/scripts/characters/Octocat.coffee