Added switching for word frequency format
Updated view.html
Merge branch 'master' of https://github.com/Falkirks/TeamShog