Added a log and a newline
Merge remote-tracking branch 'upstream/master' into hamster
added more logs and found the reason for upload not working
Got a 422 ^_^
Fixed merge conflicts from above and finally fixed the upload data set function.  Ignore the million logs.
Merge remote-tracking branch 'upstream/master' into hamster

Conflicts:
	iOS/Data_Walk/Data_Walk/MainViewController.m
Merge remote-tracking branch 'upstream/master' into hamster
Merge pull request #818 from jaypoulz/hamster

Added a million logs and an upload function that works.