Merge branch 'master' into js_data
Seconds now upload to the server as they are created
Merge pull request #8 from johnshaughnessy/js_data

Js data