did the bits and bobs
Merge branch 'master' of https://github.com/araquach/test-app

Conflicts:
	resources/views/hello.php