.DS_Store
compressed css
Merge remote branch 'origin/newtheme' into dev

Conflicts:
	sites/all/themes/bs/css/bs.no-query.css
	sites/all/themes/bs/css/bs.styles.css
Merge branch 'dev' of github.com:cristian100/buscarsalud into dev
added new stuff
Merge remote-tracking branch 'origin/dev' into newtheme