Ignore twitter bootstrap repo
Ignore static file
Merge branch 'master-upstream'

Conflicts:
	fuzzitusbackend/static
	fuzzitusbackend/static/.gitignore