headline
Merge branch 'master' of https://github.com/sixxis69/833studio

Conflicts:
	assets/css/style.css
	index.php
css