styling out nav drop down and adding link_tos
fixed merge conflicts on main.js
fixing balloon animation bug, styling ranking grid
merging branches
fixed merge conflicts with main.js