commit for elijah
Merge branch 'master' of github.com:gunhilldillz/arduino_web

Conflicts:
	README.md
	app/controllers/arduino_controller.rb
	db/schema.rb
	test/fixtures/servoposies.yml
	test/models/servopos_test.rb
	test/models/servoposy_test.rb
	test/models/user_test.rb