meaningless blank line deletion
made welcome#index view match
Merge branch 'master' of https://github.com/Tunneylax20/JSequencr
ignore these changes
ignore these changes
setting up gems for testing; some changes from before that confuse me
set up first test to select a sound for a row. included row options on left side of sequencer
add sign up controls in js
Merge pull request #10 from cranbury/user_can_login

add sign up controls in js
changes to gem
user can now input BPM
gem file mess
gemfile lock
merging with zack
take .wave off fileName
merged with zach
merge
finally merged?
users can be created
Merge pull request #12 from stevenaweiss/master

Users can be created