Merge branch 'master' of https://github.com/JasonProkop/cmpt370
updated feedback poll link
Merge branch 'master' of https://github.com/JasonProkop/cmpt370
Merge branch 'master' of ssh://webclicker.tk/~/www