Version 0

Start of 368 final
update from school folder