responsive web design about home and about us page first commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/stylesheets/app/home.less