Fixed graphing bug
Merge branch 'master' of https://github.com/jusjmkim/Tremedic
Rename some html files