yup
studio arts
Merge branch 'master' of https://github.com/th3lonius/Proboscis

Conflicts:
	js/scripts.js