.gitignore was wrong :(
Merge branch 'master' of github.com:bukzor/hackathon2013.7

Conflicts:
	chrome_extension/.gitignore