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
user can now input BPM
merging with zack
take .wave off fileName
merged with zach
merge
finally merged?
Merge pull request #12 from stevenaweiss/master

Users can be created
can log in
Merge pull request #13 from stevenaweiss/session_and_login

can log in
can pass through hardcoded sound
added one comment to soundURL
fixed merge conflicts attempt 1
have to fix double signup