updates to site
Merge branch 'master' of https://github.com/brandonratz/viewception