added the beginning structures for graphs
Merge branch 'master' of https://github.com/lourd/6813-almanac

Conflicts:
	client/views/rack/rack_page.js
	server/fixtures.js
merged conflicts
fixed conflicts
fixed conflicts
Merge branch 'master' of https://github.com/lourd/6813-almanac

Fixed Conflicts
graph now works from sensor data
Rack Page graphs added and working.
Merge branch 'master' of https://github.com/lourd/6813-almanac
final pull?
resolved conflicts
Merge branch 'master' of https://github.com/lourd/6813-almanac
Merge branch 'master' of https://github.com/lourd/6813-almanac