Merge branch 'master' of https://github.com/banana-slugs-2014/GlucoseAmigo
working x axis for graph
fixes merge conflict
moves legend to right side of graph
adds comments to data
still have to add to graph
adds comments to extra data
WIP
still working on adding comments to floating legend
possibly fixes graph bug
fixes no record issue with graph fix #100
removes test code
fixes merge conflict