init commit
Merge https://github.com/stephenconnor/SWD_Assignment