Working out modal bug - ok function
Merge branch 'Elli' of https://github.com/YfLn/CEN3031FA14 into Elli

Forgot to pull first