changing to class based views
merge branch 'master' of https://github.com/caisbalderas/nmc_viz
model based view, commit for merge
merging