renamed timeStamp to timestamp
Merge branch 'master' of github.com:rymndhng/busfumes