Adjusted transition timings
Added a sexii favicon :ribbon:
Mergey merge
Merge branch 'master' of https://github.com/uopcs/warrior

* 'master' of https://github.com/uopcs/warrior:
  Fixed button height
  Stopped map form showing if javascript is not on
Merge branch 'master' of https://github.com/uopcs/warrior

* 'master' of https://github.com/uopcs/warrior:
  Adjusted previous height!