Removed terrible files and updated gitignore
Fastforwarding
Merge remote-tracking branch 'upstream/master'
mergeconflicts
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Changed recording rate - moving to new computer
Merge remote-tracking branch 'upstream/master' into vb548
Merge branch 'vb548' of https://github.com/balabhv/iSENSE-Hardware into vb548
Migrating to iMac
bla
Test message:wq
rge branch 'vb548' of https://github.com/balabhv/iSENSE-Hardware into vb548
Changed API to reflect changes to docs
Merging changes from upstream
Merge conflicts
Fixed minor login bug
Fixing merge conflict
Fixing merge conflicts
Fixing merge conflicts
Merge branch 'vb547' of https://github.com/balabhv/iSENSE-Hardware into vb548