responsive shit
responsive shit
test
lolilol
lolilol
test
test
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/footer.php
	static/css/design.css
Merge remote-tracking branch 'origin/master'
test