Merge branch 'gh-pages'
Merge branch 'develop' into gh-pages
Merge branch 'gh-pages'
read me update
Merge branch 'gh-pages'
bower connect
Merge branch 'master' into _javascript
gitignore
Se agrego Modal
Tooltip
popover
Affix
Merge branch '_javascript' into develop

Conflicts:
	css/ego.css