First commit
Adding sqlite to Gemfile
Adding parallax template
atualizando js e alterando gemfile para upload heroku
adding rails12factor to serve assets to heroku
gemfile.lock commit
solving conflicts
solving conflicts git revert
Revert "Adding parallax template"

This reverts commit 11980b71128a111a1e2d93933dab9b9316c9a85d.

Conflicts:
	app/assets/javascripts/mysite.js
bundle install
resetting commit
Merge branch 'master' of https://github.com/luccascm/web-tp1
commit 11980b71128a111a1e2d93933dab9b9316c9a85d
Merge branch 'master' of https://github.com/luccascm/web-tp1
Revert "Adding parallax template"

This reverts commit 11980b71128a111a1e2d93933dab9b9316c9a85d.

Conflicts:
	app/assets/javascripts/mysite.js
reverting commit
reverting commit
Tentativa para rodar a aplicacao
substituindo arquivos - adicionando fontes, imagens e logo
copiando arquivos de outra pasta