html changes
Merge branch 'master' of github.com:LizCira/screen_test
Merge branch 'master' of github.com:LizCira/screen_test
Merge branch 'master' of github.com:LizCira/screen_test
pre pull commit for like method
resolved id testing conflict
added chart.js file to javascripts
about to merge master branch
about to merge master branch
chart rendering but still neeeding dynamic data points
Merge pull request #11 from jpark1120/master

monday morning scripts/likes controller merge conflict resolution
monday morning merge
resolved conflicts in index and likes controller
Merge pull request #12 from benticsay/master

monday morning merge
fixing api call errors
edited likes controller to make api call functional and tested counter