update .gitgnore
Merge branch 'master' of https://github.com/thiagofc/RubyOnRails
firulas
Merge branch 'master' of https://github.com/thiagofc/RubyOnRails

Conflicts:
	hours_colaborator/app/views/colaborators/index.html.erb
fixed conflict
Merge branch 'master' of https://github.com/thiagofc/RubyOnRails
layout
Merge branch 'master' of https://github.com/thiagofc/RubyOnRails

Conflicts:
	hours_colaborator/app/views/layouts/application.html.erb
updated .gitignore