merge
Merge branch 'master' of https://github.com/banana-slugs-2014/GlucoseAmigo

Conflicts:
	app/controllers/graphs_controller.rb
working graph with UTC code
working formatted dates
working graph with customized x axis
working graph and refactor
graph before comments
passing test with working graph pre herkou
working graph pre herkou
Merge pull request #136 from banana-slugs-2014/graph_pre_heroku

Graph pre heroku