bridge migration, model, controller, and model-controller test suites + register bridge helper methods
Merge branch 'master' into bridgelightmodels

Conflicts:
	Gemfile
modified gitignore to include coverage json files
Bridges controller rspec for #new, #create
Lamps controller rspec for #create
new column for Lamp model, hue_number
changed hue_number from integer to string
created FactoryGirl bridge build
created LampsController spec
Created show view for bridge
Added coverage files to gitignore
lamp testing for unhappy create
Merge branch 'master' into bridgelightmodels

Conflicts:
	config/routes.rb
migration for username in user table
rvm version control
changes to bridge registration for username addition, spec, controller
spec, view, controller changes to add username column
gitignore includes local computer rvmrc
Merge pull request #6 from ChaeOkay/bridgelightmodels

Bridgelightmodels
remove rvmrc file