Cambiado todo
Merge branch 'master' of github.com:imella/howishell

Conflicts:
	_assets/javascripts/app.js
	_assets/javascripts/example.js.coffee
	_assets/stylesheets/app.css
	index.html