Commit
commit
commit
Merge branch 'master' of https://github.com/KristofHermans/AS_international

Conflicts:
	.gitignore
	140926_hp_uk.html
	README.md
	bower_components/normalize-scss/LICENSE.md
	bower_components/normalize-scss/README.md
	bower_components/normalize-scss/_normalize.scss
	bower_components/normalize-scss/bower.json
	bower_components/normalize-scss/normalize.css
	config.codekit
	images/backpacks.jpg
	images/bg-fashion-max.jpg
	images/bg-fashion-mobile@2x.jpg
	images/bg-fashion.jpg
	images/bg-lookbook-outdoor-mobile@2x.jpg
	images/bg-lookbook-outdoor.jpg
	images/fashion_connector.jpg
	images/fleece_sweaters.jpg
	images/mens_fashion.jpg
	images/outdoor_clothing.jpg
	images/outdoor_shoes.jpg
	images/overlay.png
	images/slider-controls@2x.png
	images/thumbs/thumb-fashion.png
	images/thumbs/thumb-lookbook-outdoor.png
	images/transparent-bg.png
	images/womens_fashion.jpg
	javascript/bx_config.js
	javascript/min/bx_config-min.js
	lib/jquery.bxslider/bower.json
	lib/jquery.bxslider/images/bx_loader.gif
	lib/jquery.bxslider/images/controls.png
	lib/jquery.bxslider/jquery.bxslider.css
	lib/jquery.bxslider/jquery.bxslider.js
	lib/jquery.bxslider/jquery.bxslider.min.js
	lib/jquery.bxslider/plugins/jquery.easing.1.3.js
	lib/jquery.bxslider/plugins/jquery.fitvids.js
	lib/jquery.bxslider/readme.md
	stylesheets/css/screen.css
	stylesheets/sass/partials/base.scss
	stylesheets/sass/partials/layout.scss
	stylesheets/sass/partials/modules.scss
	stylesheets/sass/partials/slides/10%_fashion.scss
	stylesheets/sass/partials/slides/outdoor_lookbook.scss
	stylesheets/sass/partials/state.scss
	stylesheets/sass/partials/theme.scss
	stylesheets/sass/screen.scss
	stylesheets/sftp-config.json
	test_hp_befr.html