create models plantation_area and specie
create models plantation_area and specie
resolving conflicts with .gitignore and application.rb
Merge branch 'master' of https://github.com/inventae-team/nossas-arvores
creation of login page
creation of login page rev2
Merge pull request #7 from alessandroAlves/master

create models plantation_area and specie