added spec for datapoints
added spec for datapoints
Merge branch 'master' into chart1

 especially if it merges an updated upstream into a topic branch.
implemented csv uplaod
Fixed csv upload using Paperclip
refactored chart model
fixed merge
Trying out chartkick
merge commit
replaced hardcoded link for route helper method
charts now display datapoint values
Merge commit
gerge branch 'master' of github.com:chartist/chartist
Added .DS_Store to .gitignore
Merge branch 'master' of github.com:chartist/chartist
added view for pie chart