update
update gemfile
Merge branch 'master' of github.com:angela4713/tenshitter

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	config.ru
	db/migrations/001_create_users.rb
	db/migrations/002_create_tenshis.rb
	db/migrations/003_create_followers.rb
	db/migrations/004_rename_followers_to_relationships.rb
	db/migrations/005_rename_user_name_to_username.rb
	db/migrations/006_rename_tenshis_attributes.rb
	db/migrations/007_rename_password_to_password_hash.rb
	environment.rb
	models/relationship.rb
	models/tenshi.rb
	models/user.rb
	public/css/global.css
	public/js/functions.js
	tenshitter_app.rb
	test/models/user_test.rb
	test/test_helper.rb
	views/edit.erb
	views/form.erb
	views/index.erb
	views/tenshis.erb
	views/tenshis_news.erb
	views/user.erb
	views/username.erb