boton
Merge branch 'master' of https://github.com/danibram/danux

Conflicts:
	public/semiems/.sass-cache/f20ca4197cb1fb1c8026d5cb18733b1fc2f13478/_newstyle.scssc
	public/semiems/css/stylep.css
	public/semiems/sass/_newstyle.scss