Revert dbfa38f..e6ddcb9

This rolls back to commit dbfa38f8e91af334379177463af4f9d24318af7c.
Merge branch 'master' of https://github.com/sixxis69/833studio

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