initial commit
Merge branch 'master' of https://github.com/aromano272/Artists-Theme

Conflicts:
	.gitignore
	_config.yml
	_data/settings.yml
	_includes/about.html
	_includes/clients.html
	_includes/contact.html
	_includes/footer.html
	_includes/form.html
	_includes/header.html
	_includes/work.html
	assets/css/1-tools/_icon-font.scss
	assets/css/1-tools/_normalize.scss
	assets/css/1-tools/bourbon/_bourbon.scss
	assets/css/1-tools/bourbon/addons/_retina-image.scss
	assets/css/1-tools/bourbon/addons/_size.scss
	assets/css/1-tools/bourbon/addons/_timing-functions.scss
	assets/css/1-tools/bourbon/css3/_font-face.scss
	assets/css/2-base/_base.sass
	assets/img/logo.svg
	assets/img/travitar.jpg
	assets/img/work/proj-8/thumb.jpg
	assets/js/functions.js
	index.html