add gitignore
resolve gitignore conflict
add main layout file
Merge branch 'master' of github.com:WilliGant/all-school-video
rename view files and format for links with the id and the name and stuff
Merge branch 'master' of github.com:WilliGant/all-school-video