Added popup lightbox to charts
fixed typo on navbar
fixed merge issues
Merge branch 'lightbox'
merge commit
merge issue
Fixed CSV upload bug by deleting JS file
Merge branch 'master' of github.com:chartist/chartist
Merge
basic layout