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

Conflicts:
	assets/css/media-query.css