new initial setup
add a scala videos link
merge and resolve conflict