first
Merge branch 'master' of https://github.com/ilustr/Tp-Ent
second commit
add controller and view