Tidy up main.html page
Merge branch 'master' of github.com:jenjiraw/geekyBattlePikachu
 merge