bootstrap downloads
bootstrap downloads
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/EvilHangman.iml
	Gemfile
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/EvilHangman.iml
	Gemfile
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/EvilHangman.iml
	Gemfile
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/EvilHangman.iml
	Gemfile
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/application.html.erb
	app/views/users/_form.html.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/application.html.erb
	app/views/users/_form.html.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/application.html.erb
	app/views/users/_form.html.erb
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/sessions/new.html.erb