renamte bootstrap css file name
add twitter login
resolving conflicts on schema
Conflicts:
	db/schema.rb