add controller and view
change root
add gitignore
conflict fix
Merge branch 'master' of github.com:netguru-training/ChallengeMe