rebuilt the responsive structure
Merge branch 'master' of github.com:Franciscowxp/front
fix the merge
Conflicts:
	Gruntfile.js