Merge branch 'master' of https://github.com/pkawiak/game-off-2013

Conflicts:
	js/app.js