Playing with it
Merge branch 'master' of https://github.com/nandorsky/barcrawl

Conflicts:
	index.html