Stuff
Fonts/margins
Merge branch 'layout'

Conflicts:
	site/css/main.css
	site/css/main.scss
	site/index.html
	site/js/main.js
original ajax.js
Whatever.
Merge commit '52f3d4b552298ec3e490e21e6871aaca45dc8879'
remove overlay
remove article styling
Merge branch 'master' of https://github.com/edlongman/thescoop
Slideup bug
Slideup bug
remove loading text
fixed ots.php
Merge branch 'master' of https://github.com/edlongman/thescoop
Removed 'null' from the start of sums.
added very important .py file
Loading is in the middle of the screen
CSS
Merge branch 'master' of https://github.com/edlongman/thescoop
Categories