perentage
Merge remote-tracking branch 'origin/master'
fixed base.html Still need to fix font size and shit