Delete config.yml
Merge remote-tracking branch 'origin/bootstrap3/stewart' into bootstrap-3
Remove return to store link
Meta Links
Merge branch 'master' into bootstrap3/darryn
Update Bootstrap
activate theme settings styles
fix google fonts snippet
Merge branch 'master' into bootstrap3/darryn
rename bootstrap files
delete 'show sidebar' setting conditional on homepage

was preventing all thumbnails from displaying on homepage
homepage collection image bug
Clear all settings from _settings.scss.liquid
Tidy up slider
Fix glitch on homepage when no collection specified
add clearfix for horizontal product alignment on collection pages
tidy up currency cinverter
starting to develop search field
Merge branch 'bootstrap3/darryn'

Conflicts:
	theme/assets/_settings.scss.liquid
bootstrap updates