testing branches
fixin' schtuff
Merge remote-tracking branch 'origin/loading'

Conflicts:
	static/recap.css
	templates/recap.html