adding fixes for screeens mispell, bug which allows user to upload data multiple times after single data collect, throw out (0,0) points.
added start/stop button in place of 2 separate button
added start/stop button in place of 2 separate button
new icons!
more icons
current time now obtained from System call
Wrote a mime function
merge with mike n' ikes
marker detector changes
Started sideproject to test image uploading.
Merge remote-tracking branch 'upstream/master' into hamster
Merge remote-tracking branch 'upstream/master' into hamster
Merge remote-tracking branch 'upstream/master' into hamster
Merge remote-tracking branch 'upstream/master' into hamster
Merge branch 'master' of github.com:isenseDev/iSENSE-Hardware into brigit_dev
Working on Pictures
Merge remote-tracking branch 'upstream/master' into hamster
Merge pull request #837 from nickavv/parachute

icon updates
Changed Data Collector to Uploader, began work on that, changed Uploader and Pendulum Trackers icon
Merge pull request #838 from stowellm/goat

Changed Data Collector to Uploader, began work on that, changed Uploader...