completed site functionality
Merge branch 'master' of github.com:alexyoung1992/itp310