styling changes
Merge branch 'master' of github.com:gunhilldillz/arduino_web

Conflicts:
	app/controllers/sessions_controller.rb
	db/development.sqlite3
	log/development.log