Add node to gitignore
Merge branch 'master' of github.com:felipedaraujo/mudancas-e-cargas

Conflicts:
	app/assets/stylesheets/welcome.css.scss
	app/views/welcome/index.html.haml