weird thing with ds_store
merge conflict
recorder is working for computer
Merge branch 'master' of https://github.com/red-admirals-2014/Stage-Fright
"merge conflicts"
fixing merge conflict with env file
recorder is working but user must save the recording then choose to upload it
Merge branch 'master' of https://github.com/red-admirals-2014/Stage-Fright
merge conflicts
Merge branch 'master' into record_audio
"getting latest version of master"
made vote controller as set up for ajax from js voting functions
Merged Amy's branch with master
- Adds Audio Recording
- Fixed issue with mic jquery listener conflicting with master listener.
Merge pull request #26 from red-admirals-2014/record_audio

Record audio

:thumbsup:
Recenlty merged Amy's branch in.

Merge branch 'master' into voting_db_and_relationships
Able to pass user id, song id and vote, also able to create a vote, however working on playing next song