Edited file according to assignment 2 requirements

Started in a fresh file, some formatting is different to original