Merge branch 'master' into lab
Lab solution

The application will now compile and run as expected for the lab
solution. No refactoring or tidy-up steps have yet be executed
Merge pull request #1 from Sh3z/lab

The application will now compile and run as expected for the lab solution. No refactoring or tidy-up steps have yet be executed