Merge branch 'master' of github.com:lindakukolich/sensor_data_exploration

Just accepting all the new stuff. Conflict is in models
Merge branch 'master' of github.com:lindakukolich/sensor_data_exploration
Shows data
I messed this file up.

It should be the same as the one Linda created now
A sample high charts chart shows up on our page!