change and unroll
before trying post
prepping to merge with Taylor
Merge branch 'tap-with-audio' of https://github.com/VT-CHCI/SoundOfFractions into fromhome

Conflicts:
	app/assets/javascripts/backbone/views/beats/beatView.js
	app/models/user.rb
	config/routes.rb
	db/development.sqlite3
	db/schema.rb
leaving
finally back
Merge branch 'fromhome' of https://github.com/VT-CHCI/SoundOfFractions into kickoffWeek

# By Taylor (13) and phycom06 (4)
# Via phycom06
* 'fromhome' of https://github.com/VT-CHCI/SoundOfFractions:
  leaving
  Working on speed of rendering of beats.
  prepping to merge with Taylor
  Fixed beads being drawn on all re-renders.
  messing with timing.
  messed with some css.
  Fixed transport and record button toggle issues.
  Beat pattern recording is now working. (With a huge margin for error)
  Fixed tempo slider issues. It's now a multiplier of a base tempo (default is 120).
  Added tap tempo button and separated concerns with it and recording.
  before trying post
  Added settings button and fixed routes.
  Removed setting_id column from User database.
  change and unroll
  messed with create in setting routes.
  Added Setting scaffold and messed with new and edit views. Need to work on the controllers.
  Converted to microphone input.

Conflicts:
	app/assets/javascripts/backbone/views/beats/beatView.js
	app/assets/javascripts/backbone/views/measures/measuresView.js
going to break db
again
people added, and fixed classes
Fixed AudioContext lifetime issue.