Properly parsed the JSON, converted time to UNIX time
Merge branch 'master' of github.com:mayormcmatt/birdhaus

Conflicts:
	app/assets/javascripts/application.js
	public/templates/dashboard.html