Lots of changes
Merge branch 'master' of https://github.com/cameronmccord2/cs340
more changes
merge conflicts
changes
Merge branch 'master' of https://github.com/cameronmccord2/cs340
Merge branch 'master' of https://github.com/cameronmccord2/cs340
many changes, fixed poller, some view fixes