uploaded everything I've done so far

this includes some basic HTML for the views
branches merged (hopefully)
Merge branch 'gh-pages'
finally installed the packages in new computer