Squashed commit of the following:

commit 99f09031ab232d3f0c1605e4950b1c25c9537ff7
Merge: ce69887 600e837
Author: Thiago Ramos <thiagoramos.al@gmail.com>
Date:   Fri Sep 5 10:43:25 2014 -0300

    Resolvendo conflitos no schema.rb e Gemfile.lock

commit ce698878297c293b4f1054880de609bca59035b7
Merge: ca8b30a 9b10c72
Author: Thiago Ramos <thiagoramos.al@gmail.com>
Date:   Thu Sep 4 23:54:04 2014 -0300

    Resolvendo conflitos no gemfile e no schema.rb
    Executando amend para rodar a build

commit ca8b30adf392d266475678f9af558e8eeeb16fd3
Author: Thiago Ramos <thiagoramos.al@gmail.com>
Date:   Thu Sep 4 23:51:08 2014 -0300

    Crud de categoria criado

commit 600e837847429ba25b6bfd376e87a411ecbfd08d
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Thu Sep 4 20:15:21 2014 -0300

    Adicionado Wender como contribuinte

commit ac3e726571dd96c4bff0b57983787aa4097dc0e0
Merge: 3fce555 948c18c
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Thu Sep 4 20:11:29 2014 -0300

    Merge pull request #95 from wenderjean/master

    Desenvolvida a view de cast conforme issue #94

commit 948c18c6e8536e94614fcb0bbd41d3984403cf33
Author: Wender Freese <wender.jean@gmail.com>
Date:   Thu Sep 4 20:00:38 2014 -0300

    Alterando comportamento do casts controller para utilizar Responders

commit d19e794a293bb3f4eb37b2076df2a9d8d9a19a98
Author: Wender Freese <wender.jean@gmail.com>
Date:   Tue Sep 2 17:11:15 2014 -0300

    Corrigindo review da issue #95

commit c2d1b6db99d96079384a163bbb50bb2a6444c173
Author: Wender Freese <wender.jean@gmail.com>
Date:   Tue Sep 2 17:08:57 2014 -0300

    Corrigindo reviews da issue #95

commit 7c7bb9a539a6561a34322186d0659e9eb6e4e01a
Author: Wender Freese <wender.jean@gmail.com>
Date:   Thu Aug 28 22:51:57 2014 -0300

    Desenvolida a view cast conforme issue #94

commit 9b10c729ec020cac893d58892c65908ed22959ff
Author: Thiago Ramos <thiagoramos.al@gmail.com>
Date:   Thu Aug 28 11:28:30 2014 -0300

    Tentando consertar problemas de identação e blocos apontados pelo houndci

commit 3fce5556299f9d99d3e493023366d8c1d9e706ed
Merge: 9dea85a fbb8756
Author: Abilio Bittencourt Junior <abilio.jr@live.com>
Date:   Mon Aug 25 15:48:29 2014 -0300

    Merge pull request #90 from plribeiro3000/refactoring_structure

    Reorganizando arquivos de logo e mockup

commit fbb8756d43c0e6c020867d2d907db8d96321cdd6
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Mon Aug 25 10:10:28 2014 -0300

    Reorganizando arquivos de logo e mockup

commit 9dea85a315a26b123d6fd67c88872310e66eab00
Merge: 9ab1907 cea3706
Author: Gustavo Araújo <gu.araujo25@gmail.com>
Date:   Mon Aug 25 08:57:49 2014 -0300

    Merge pull request #88 from juhguu/layout

    [skip ci] Enviando os layouts

commit cea3706dc54dd157016ffb653a8643b8a5eb1cbd
Author: juhguu <gu.araujo25@gmail.com>
Date:   Mon Aug 25 08:13:16 2014 -0300

    [skip ci] Modificando ícone de nova conta e removendo do logotipo incorreto do repositório

commit d0c5e2d0e403e9684419c9fef8ff340371c2109f
Author: juhguu <gu.araujo25@gmail.com>
Date:   Mon Aug 25 07:47:58 2014 -0300

    [skip ci] Adequando layout ao projeto

commit 4708399b0c47b66517ee39671711a1a01bdf253c
Author: juhguu <gu.araujo25@gmail.com>
Date:   Sun Aug 24 18:41:33 2014 -0300

    [skip ci] Enviando os layouts

commit 9ab190745f3a3c4946addbfb26e35c6915984575
Merge: b1c1004 a0686d5
Author: Ivan Santos <pragmaticivan@gmail.com>
Date:   Sat Aug 23 14:42:33 2014 -0300

    Merge pull request #87 from antigui22/master

    Logo Atualizada

commit b1c1004a24e797a6add4ec56568fea80877d2c2c
Merge: a6ecdda f982c08
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Fri Aug 22 11:15:27 2014 -0600

    Merge pull request #86 from pragmaticivan/rails_dotenv

    Adicionando rails dotenv ao projeto

commit f982c08ce0396e29465d1b1b0be39ff93884a383
Author: Ivan Santos <pragmaticivan@gmail.com>
Date:   Fri Aug 22 14:03:23 2014 -0300

    Adicionando rails dotenv ao projeto

commit a6ecdda9adc18d9bb5d25ddc0c81cd8730784cc7
Merge: 90338b8 a89f8e1
Author: Ivan Santos <pragmaticivan@gmail.com>
Date:   Fri Aug 22 13:37:00 2014 -0300

    Merge pull request #82 from plribeiro3000/hound_update

    Atualizado configs do hound para a nova sintaxe do Rubocop

commit 90338b85794f9bfd38687cee65ea5e4601803c35
Merge: bf4d7cb da8a7d0
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Fri Aug 22 10:33:01 2014 -0600

    Merge pull request #84 from pragmaticivan/rails_gem_update_4.1.6.rc1

    Atualizando versão do rails para 4.1.6.rc1

commit da8a7d04302f9befdf4ce339cb38127d2e00435e
Author: Ivan Santos <pragmaticivan@gmail.com>
Date:   Fri Aug 22 13:25:02 2014 -0300

    Atualizando versão do rails para 4.1.6.rc1

commit a89f8e11011cd93675484a41038f4dac7e120e41
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Fri Aug 22 12:47:46 2014 -0300

    Atualizado configs do hound para a nova sintaxe do Rubocop

commit c211317c504f777b5fa8a089622d01b171476ed6
Author: Thiago Ramos <thiagoramos.al@gmail.com>
Date:   Fri Aug 22 12:26:09 2014 -0300

    Melhorando testes do destroy e consertando bug adicionado no teste de redirecionamento com usuario nao logado no método destroy

commit 9fdc2b599193d14ac872529a975215b4332ac47d
Merge: 6c0e340 b65ce21
Author: Thiago Ramos <thiagoramos.al@gmail.com>
Date:   Fri Aug 22 12:10:48 2014 -0300

    Merge de diff no before_action

commit 6c0e340558622e35951717d5882047e8542d7f9b
Author: Thiago Ramos <thiagoramos.al@gmail.com>
Date:   Fri Aug 22 12:09:22 2014 -0300

    Adicionando teste para destroy e adicionando a funcionalidade de destroy que estava faltando. Removendo identações com tab.

commit a0686d5a36bdd5e67b5f23fd27ad811c15d6cc16
Author: antigui22 <abilio.jr@live.com>
Date:   Fri Aug 22 10:05:48 2014 -0300

    Logo Atualizada

    logo atualizada arquivos base em corel em rgb e cmyk (pra quem for fazer
    a camisa) e o pdf pra quem usa photoshop, quem for abrir o arquivo corel
    baixe as fontes

commit b65ce21a184a2ad058954ef2af0ba35f060d78c0
Author: Thiago Ramos <thiagoramos.al@gmail.com>
Date:   Fri Aug 22 02:15:05 2014 -0300

    Update categories_controller.rb

     Consertando identação

commit f04f6cf2876ba2296448f98e77103ce05daa4530
Author: Thiago Ramos <thiagoramos.al@gmail.com>
Date:   Fri Aug 22 02:13:45 2014 -0300

    Update categories_controller.rb

    Consertando identação

commit 60aef1d4cf5aec0c6dae59c70fe23706e4cc2b2a
Merge: 18814ca bf4d7cb
Author: Thiago Ramos <thiagoramos.al@gmail.com>
Date:   Fri Aug 22 01:54:12 2014 -0300

    Merge branch 'master' of https://github.com/RubyCastsBrasil/RubyCastsBrasil

    * 'master' of https://github.com/RubyCastsBrasil/RubyCastsBrasil:
      Corrigida a issue #79
      Adicionando @juhguu como contribuinte
      Layout da home

commit 18814cac3cd4f907bf9f4256d1448f9f6298fefc
Author: Thiago Ramos <thiagoramos.al@gmail.com>
Date:   Fri Aug 22 01:53:57 2014 -0300

    Crud de categoria criado.

commit bf4d7cbb18f359b9cfcc65982eee42d112b6d97a
Merge: 1d01cdc 2d1b2f5
Author: Wender Freese <wender.jean@gmail.com>
Date:   Fri Aug 22 00:01:43 2014 -0300

    Merge branch 'master' of https://github.com/RubyCastsBrasil/RubyCastsBrasil

commit 1d01cdcf9e6488622fd3458b029755e2f5e1dab8
Author: Wender Freese <wender.jean@gmail.com>
Date:   Thu Aug 21 23:50:17 2014 -0300

    Corrigida a issue #79

commit 2d1b2f52123bf2bad7d1755e72e11903d84b5b68
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Thu Aug 21 20:25:21 2014 -0300

    Adicionando @juhguu como contribuinte

commit 02fbc5881849618711479c9b0262135a6debb29a
Merge: 80e2ae9 14d5926
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Thu Aug 21 17:19:59 2014 -0600

    Merge pull request #77 from juhguu/master

    Layout da home

commit 14d5926a7697b5b35b17d982d55de1e09aafc0cd
Author: juhguu <gu.araujo25@gmail.com>
Date:   Thu Aug 21 20:15:35 2014 -0300

    Layout da home

commit 80e2ae94ff0331f654142cca0c4183492c25bd06
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Tue Aug 19 10:10:00 2014 -0300

    Bump rails version to 4.1.5

commit ab1c95883a1cd96bc5491960c5fb2475fd77190b
Merge: f22cfd3 d8f9661
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Thu Aug 14 07:17:36 2014 -0600

    Merge pull request #73 from victorlcampos/adicionando_link_perfil

    Adicionando links ao perfil do usuario

commit d8f9661cd92f25487508c3500ca1c0c9fbd2cd17
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Thu Aug 14 10:21:41 2014 +0000

    arrumando pontos levantados pelo houndci

commit 1828f21fa4ce5b130faa8c5a703a677fcd4c37ab
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Thu Aug 14 01:39:28 2014 +0000

    adicionando links ao perfil do usuario

commit f22cfd36d9eba6307b105c145209678213caa282
Merge: e769c4c df70fa2
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Tue Aug 12 11:00:28 2014 -0300

    Merge branch 'master' of github.com:RubyCastsBrasil/RubyCastsBrasil

commit e769c4c6f3520187ea4f8a61ca4d51fe12d8992c
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Tue Aug 12 10:47:47 2014 -0300

    Atualizando lista de contribuintes

commit df70fa2c60146be2281a0ae0c88631767ac41f64
Merge: f9442eb 83cf590
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Tue Aug 12 06:20:47 2014 -0600

    Merge pull request #71 from antigui22/master

    Logo

commit 83cf590c9529ef6989871d295c78cc55c576658c
Author: antigui22 <abilio.jr@live.com>
Date:   Mon Aug 11 03:03:12 2014 -0300

    Logo

    logo em seus formatos e favicon em breve postarei os arquivos abertos

commit f9442eba7c3b543ea96d25bace59d6557b091930
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Mon Aug 11 00:41:54 2014 -0300

    Pontos levantados pelo @houndci no pr #68 corrigidos

commit 24f1f2dd4ef135a497ff60c000656da3553c8865
Merge: 4bc4551 c36a8f6
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Sun Aug 10 21:38:55 2014 -0600

    Merge pull request #68 from victorlcampos/adicionando_cast

    Adicionando casts as plataformas

commit c36a8f6c2c6645f45a9e34c0192d86abc5541b26
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Sun Aug 10 14:19:17 2014 +0000

    adicionando modelo cast

    adding controller

    adding new action

    adicionando acao create

    adicionando fabrica de usuarios

    adicionando acao edit

    adicionando acao update

    adicionando tags ao cast

    adicionando fabrica de usuarios

    adicionando acao update

    refatorando modo de criacao de casts do usuario

commit 4bc4551ea790950797ade79991ac1cfddde2a248
Merge: eadc0f4 fde89cd
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Sun Aug 10 09:07:56 2014 -0600

    Merge pull request #67 from victorlcampos/adicionando_tags

    Adicionando tags

commit eadc0f4a67844d1cb0af91a879fc1cf8fa7c11f5
Merge: 05ac001 de5ec14
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Sun Aug 10 08:00:10 2014 -0600

    Merge pull request #66 from victorlcampos/adicionando_bullet

    Adicionando bullet

commit fde89cd90559ca2e07bbbf1d55a13f69f18337cc
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Sun Aug 10 13:40:53 2014 +0000

    adicionando modelos

commit de5ec1444d29824aa346430888f240deb3b33fd3
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Sun Aug 10 10:54:15 2014 +0000

    adicionando configuracoes do bullet

commit c6fc73e07ef06ae5a4d3b0f5c2ffb50b0686af67
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Sun Aug 10 10:47:42 2014 +0000

    adicionandoa gem bullet ao projeto

commit 05ac00158518aa5d35c749a5eef337456f6ec18c
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Fri Aug 8 11:40:00 2014 +0000

    Executando o brakeman no travis

commit f50c622d7716f228b9428468890ab9dd3ecc8da7
Merge: 13195fa d4feea4
Author: Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
Date:   Thu Aug 7 20:29:05 2014 -0600

    Merge pull request #61 from victorlcampos/remove_email_confirmation

    Remove email confirmation need for sign up

commit d4feea4c96086cf729bac2f2ae0ff2a4a4c41417
Merge: dd9fdb2 7bc5303
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Thu Aug 7 23:01:43 2014 -0300

    Merge branch 'remove_email_confirmation' of github.com:victorlcampos/RubyCastsBrasil into remove_email_confirmation

commit dd9fdb2aed95c3cedb8c2a6f2961c4cfdb3d5289
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Thu Aug 7 22:28:32 2014 -0300

    me adicionando como colaborador

commit 3970dd0b454e2066181726bc75ac31f4dc767195
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Fri Aug 8 00:56:25 2014 +0000

    remove skip_confirmation from attributes

commit 044dc665d948497faf200e4e06edb8076a5b9436
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Thu Aug 7 21:42:19 2014 -0300

    remove email confirmation need for sign up

commit 7bc5303525ed9d1993bf1a352377afc6b1a8b8ff
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Thu Aug 7 22:28:32 2014 -0300

    me adicionando como colaborador

commit e7ecd1a0f9adceb7d1f70a8c367014e3664763e6
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Fri Aug 8 00:56:25 2014 +0000

    remove skip_confirmation from attributes

commit 2a1700fcad0b6e1ed18388dd928ed15ea85b2980
Author: Victor Campos <victorcampos@ufrj.br>
Date:   Thu Aug 7 21:42:19 2014 -0300

    remove email confirmation need for sign up
Merge branch 'master' of https://github.com/thiagoramos23/RubyCastsBrasil

* 'master' of https://github.com/thiagoramos23/RubyCastsBrasil: (40 commits)
  Crud de categoria criado
  Adicionado Wender como contribuinte
  Alterando comportamento do casts controller para utilizar Responders
  Corrigindo review da issue #95
  Corrigindo reviews da issue #95
  Desenvolida a view cast conforme issue #94
  Tentando consertar problemas de identação e blocos apontados pelo houndci
  Reorganizando arquivos de logo e mockup
  [skip ci] Modificando ícone de nova conta e removendo do logotipo incorreto do repositório
  [skip ci] Adequando layout ao projeto
  [skip ci] Enviando os layouts
  Adicionando rails dotenv ao projeto
  Atualizando versão do rails para 4.1.6.rc1
  Atualizado configs do hound para a nova sintaxe do Rubocop
  Melhorando testes do destroy e consertando bug adicionado no teste de redirecionamento com usuario nao logado no método destroy
  Adicionando teste para destroy e adicionando a funcionalidade de destroy que estava faltando. Removendo identações com tab.
  Logo Atualizada
  Update categories_controller.rb
  Update categories_controller.rb
  Crud de categoria criado.
  ...