Cleaned up the javascript code getting rid of console logs and commented out code.
Users Controller update tests added
Recording playback is fixed. Next step is fixing the newline playback bug.
still working on getting new line cursor bug to work
resolved merge conflict regarding css box shadow
The bug was from adding the span around a newline character. I added in a space before the newline character during playback that way the cursor shows up.
add feature testing for questions and categories. all passing, but not complete
Merge pull request #75 from Adrian-Pask/Test/users-controller

Test/users controller update
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
pull from master, most up to date, plus questions and answers tests
Merged
Merge branch 'CleanedFormattingOfCode' of https://github.com/JohnathanWeisner/thedelta into JohnathanWeisner-CleanedFormattingOfCode
Merge pull request #76 from plondon/feature/stylize-pages

Feature/stylize pages
merge conflict with coverage stats
resolve merge conflicts regarding css
Merge pull request #78 from plondon/JohnathanWeisner-CleanedFormattingOfCode

Johnathan weisner cleaned formatting of code
fixed merge conflicts with language css file, media queries now working and recorder cursor working
Merge branch 'JohnathanWeisner-RecordingPlayBackFixed'
fix conflict on show page
Merge pull request #79 from plondon/master

cursor functionality now working, conflicts avoided