delete middle
Merge branch 'master' of https://github.com/jyundesign/dev

Conflicts:
	Gemfile
	source/stylesheets/all.scss